diff --git a/doc/source/execution.rst b/doc/source/execution.rst
index 6ca7330f5..326b56c33 100644
--- a/doc/source/execution.rst
+++ b/doc/source/execution.rst
@@ -76,10 +76,10 @@ jenkins section
   By default this is set to the system configured socket timeout.
 
 **query_plugins_info**
-  Whether to query the Jenkins instance for plugin info when a configuration
-  file is provided. If a configuration file is not provided `jenkins-jobs` will
-  ignore this setting and skip querying for plugin information. True by
-  default.
+  Whether to query the Jenkins instance for plugin info. If no configuration
+  files are found (either in the default paths or given through the
+  command-line), `jenkins-jobs` will skip querying for plugin information. True
+  by default.
 
 
 hipchat section
diff --git a/jenkins_jobs/cmd.py b/jenkins_jobs/cmd.py
index 188fe345b..898e588e9 100755
--- a/jenkins_jobs/cmd.py
+++ b/jenkins_jobs/cmd.py
@@ -187,6 +187,7 @@ def setup_config_settings(options):
     # Load default config always
     config.readfp(StringIO(DEFAULT_CONF))
     if os.path.isfile(conf):
+        options.conf = conf  # remember file we read from
         logger.debug("Reading config from {0}".format(conf))
         conffp = io.open(conf, 'r', encoding='utf-8')
         config.readfp(conffp)