diff --git a/debian/changelog b/debian/changelog
index d4d8f1d..cf07842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ ubuntu-dev-tools (0.137) UNRELEASED; urgency=low
   * mk-sbuild, pbuilder-dist, ubuntu-build: Add armhf.
   * pull-debian-source, pull-lp-source: Resolve the source package (via DDE),
     if a binary package was requested (LP: #617349)
-  * New Tool: upload-permission: Query upload permissions (LP: #876554)
+  * New Tool: ubuntu-upload-permission: Query upload permissions (LP: #876554)
 
   [ Andreas Moog ]
   * sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884)
diff --git a/debian/control b/debian/control
index 19cec22..b70af40 100644
--- a/debian/control
+++ b/debian/control
@@ -106,4 +106,6 @@ Description: useful tools for Ubuntu developers
     command line.
   - ubuntu-iso - output information of an Ubuntu ISO image.
   - update-maintainer - script to update maintainer field in ubuntu packages.
-  - upload-permission - query / list the upload permissions for a package.
+  - ubuntu-upload-permission - query / list the upload permissions for a
+    package.
+  - update-maintainer - Set the Ubuntu-policy Maintainer in debian/control.
diff --git a/debian/copyright b/debian/copyright
index 5933bf2..67276b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -150,14 +150,15 @@ Files: doc/pull-debian-debdiff.1
        doc/reverse-depends.1
        doc/sponsor-patch.1
        doc/ubuntu-dev-tools.5
+       doc/ubuntu-upload-permission.1
        doc/update-maintainer.1
-       doc/upload-permission.1
        pull-debian-debdiff
        pull-debian-source
        requestbackport
        reverse-depends
        sponsor-patch
        test-data/*
+       ubuntu-upload-permission
        ubuntutools/archive.py
        ubuntutools/builder.py
        ubuntutools/config.py
@@ -167,7 +168,6 @@ Files: doc/pull-debian-debdiff.1
        ubuntutools/test/*
        ubuntutools/update_maintainer.py
        update-maintainer
-       upload-permission
 Copyright: 2009-2011, Benjamin Drung <bdrung@ubuntu.com>
            2010,      Evan Broder <evan@ebroder.net>
            2008,      Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
diff --git a/doc/upload-permission.1 b/doc/ubuntu-upload-permission.1
similarity index 78%
rename from doc/upload-permission.1
rename to doc/ubuntu-upload-permission.1
index 742b95d..4d97b03 100644
--- a/doc/upload-permission.1
+++ b/doc/ubuntu-upload-permission.1
@@ -11,18 +11,18 @@
 .\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 .\" OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
-.TH upload\-permission 1 "November 2011" ubuntu\-dev\-tools
+.TH ubuntu\-upload\-permission 1 "November 2011" ubuntu\-dev\-tools
 
 .SH NAME
-upload\-permission \- Query upload rights and (optionally) list the
-people and teams with upload rights for a package
+ubuntu\-upload\-permission \- Query upload rights and (optionally) list
+the people and teams with upload rights for a package
 
 .SH SYNOPSIS
-.B upload\-permission \fR[\fIoptions\fR] \fIpackage
+.B ubuntu\-upload\-permission \fR[\fIoptions\fR] \fIpackage
 
 .SH DESCRIPTION
-\fBupload\-permission\fR checks if the user has upload permissions for
-\fIpackage\fR.
+\fBubuntu\-upload\-permission\fR checks if the user has upload
+permissions for \fIpackage\fR.
 If the \fB\-\-list\-uploaders\fR option is provided, all the people and
 teams that do have upload rights for \fIpackage\fR will be listed.
 
@@ -54,7 +54,7 @@ You don't have the necessary upload rights.
 There was an error.
 
 .SH AUTHORS
-\fBupload\-permission\fR and this manpage were written by Stefano Rivera
-<stefanor@ubuntu.com>.
+\fBubuntu\-upload\-permission\fR and this manpage were written by
+Stefano Rivera <stefanor@ubuntu.com>.
 .PP
 Both are released under the terms of the ISC License.
diff --git a/setup.py b/setup.py
index 92d9c96..2efa54f 100755
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@ scripts = ['404main',
            'syncpackage',
            'ubuntu-build',
            'ubuntu-iso',
+           'ubuntu-upload-permission',
            'update-maintainer',
-           'upload-permission',
           ]
 
 if __name__ == '__main__':
diff --git a/upload-permission b/ubuntu-upload-permission
similarity index 100%
rename from upload-permission
rename to ubuntu-upload-permission