diff --git a/aodh/cmd/__init__.py b/aodh/cmd/__init__.py
index a0817c171..0be90b5ec 100644
--- a/aodh/cmd/__init__.py
+++ b/aodh/cmd/__init__.py
@@ -14,15 +14,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
+import sys
 
 
 def config_generator():
-    args = ['--output-file', 'etc/aodh/aodh.conf']
     try:
         from oslo_config import generator
         generator.main(
             ['--config-file',
              '%s/aodh-config-generator.conf' % os.path.dirname(__file__)]
-            + args)
+            + sys.argv[1:])
     except Exception as e:
         print("Unable to build sample configuration file: %s" % e)
+        return 1
diff --git a/aodh/aodh-config-generator.conf b/aodh/cmd/aodh-config-generator.conf
similarity index 90%
rename from aodh/aodh-config-generator.conf
rename to aodh/cmd/aodh-config-generator.conf
index cf47d9a0b..87648119f 100644
--- a/aodh/aodh-config-generator.conf
+++ b/aodh/cmd/aodh-config-generator.conf
@@ -1,5 +1,4 @@
 [DEFAULT]
-output_file = etc/aodh/aodh.conf
 wrap_width = 79
 namespace = aodh
 namespace = aodh-auth
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9068bd603..9995e062b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@ extensions = [
 ]
 
 config_generator_config_file = os.path.join(ROOT,
-                                            'aodh/aodh-config-generator.conf')
+                                            'aodh/cmd/aodh-config-generator.conf')
 sample_config_basename = '_static/aodh'
 
 wsme_protocols = ['restjson', 'restxml']