diff --git a/backportpackage b/backportpackage
index ae5bb6a..b01836a 100755
--- a/backportpackage
+++ b/backportpackage
@@ -103,7 +103,7 @@ def parse(args):
                  default=None,
                  help='Launchpad instance to connect to (default: production)',
                  metavar='INSTANCE')
-    p.add_option('--no-conf', '--noconf',
+    p.add_option('--no-conf',
                  dest='no_conf',
                  default=False,
                  help="Don't read config files or environment variables",
diff --git a/doc/backportpackage.1 b/doc/backportpackage.1
index be4407c..ea5353a 100644
--- a/doc/backportpackage.1
+++ b/doc/backportpackage.1
@@ -72,9 +72,9 @@ deleted before \fIbackportpackage\fR exits.
 Use the specified instance of Launchpad (e.g. "staging"), instead of
 the default of "production".
 .TP
-.B \-\-no\-conf\fR, \fB\-\-noconf
-Do not read any configuration files.
-This can only be used as the first option given on the command\-line.
+.B \-\-no\-conf
+Do not read any configuration files, or configuration from environment
+variables.
 .SH DESCRIPTION
 \fBbackportpackage\fR fetches a package from one Ubuntu release or
 from a specified .dsc path or URL and creates a no-change backport of
diff --git a/doc/ubuntu-dev-tools.5 b/doc/ubuntu-dev-tools.5
index 3e709f4..be239e3 100644
--- a/doc/ubuntu-dev-tools.5
+++ b/doc/ubuntu-dev-tools.5
@@ -30,8 +30,7 @@ All variables are described in the script's manpages. Package\-wide
 variables begin with "\fIUBUNTUTOOLS\fR" and are listed below.
 
 Every script which reads the configuration files can be forced to ignore
-them by using \fB\-\-no\-conf\fR as the \fIfirst\fR command\-line
-option.
+them by using the \fB\-\-no\-conf\fR command\-line option.
 
 .SH ENVIRONMENT
 All \fBubuntu\-dev\-tools\fR configuration variables can be set (and