diff --git a/Authors b/Authors
index c72bc6dd41..9fe2e0bcda 100644
--- a/Authors
+++ b/Authors
@@ -1,3 +1,4 @@
+Adam Gandelman <adam.gandelman@canonical.com>
 Andrey Brindeyev <abrindeyev@griddynamics.com>
 Brian Lamar <brian.lamar@rackspace.com>
 Brian Waldon <brian.waldon@rackspace.com>
diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst
index cdbb497188..dfd0a72b46 100644
--- a/doc/source/configuring.rst
+++ b/doc/source/configuring.rst
@@ -29,7 +29,6 @@ use (see `the documentation on controller Glance servers <controllingservers>`_)
 If you do **not** specify a configuration file, Glance will look in the following
 directories for a configuration file, in order:
 
-* ``$CWD``
 * ``~/.glance``
 * ``~/``
 * ``/etc/glance``
@@ -80,7 +79,6 @@ file. If it is, then we try to use that as the configuration file. If there is
 no file or there were no arguments, we search for a configuration file in the
 following order:
 
-* ``$CWD``
 * ``~/.glance``
 * ``~/``
 * ``/etc/glance``
diff --git a/glance/common/config.py b/glance/common/config.py
index c4f614b2bc..e7ec714e00 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -189,7 +189,6 @@ def find_config_file(app_name, options, args):
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance
@@ -207,8 +206,7 @@ def find_config_file(app_name, options, args):
             return fix_path(args[0])
 
     # Handle standard directory search for $app_name.conf
-    config_file_dirs = [fix_path(os.getcwd()),
-                        fix_path(os.path.join('~', '.glance')),
+    config_file_dirs = [fix_path(os.path.join('~', '.glance')),
                         fix_path('~'),
                         '/etc/glance/',
                         '/etc']
@@ -228,7 +226,6 @@ def load_paste_config(app_name, options, args):
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app_name.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance
@@ -264,7 +261,6 @@ def load_paste_app(app_name, options, args):
     * If --config-file option is used, use that
     * If args[0] is a file, use that
     * Search for $app_name.conf in standard directories:
-        * .
         * ~.glance/
         * ~
         * /etc/glance