diff --git a/debian/control b/debian/control
index 04712c8..8941ebb 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,6 @@ Description: useful tools for Ubuntu developers
     sbuild.
   - pbuilder-dist, cowbuilder-dist - wrapper script for managing several build
     chroots (for different Ubuntu and Debian releases) on the same system.
-  - pkg-on-images - query if a package is included in daily images.
   - pull-debian-debdiff - attempts to find and download a specific version of
     a Debian package and its immediate parent to generate a debdiff.
   - pull-debian-source - downloads the lastest source package available in
@@ -107,3 +106,4 @@ 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.
+  - ubuntu-safe-to-upload - query if a package is safe to upload during a freeze.
diff --git a/debian/copyright b/debian/copyright
index 9d3ab4b..b4125cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -144,22 +144,22 @@ License: GPL-3+
  On Debian systems, the complete text of the GNU General Public License
  version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
 
-Files: doc/pkg-on-images.1
-       doc/pull-debian-debdiff.1
+Files: doc/pull-debian-debdiff.1
        doc/pull-debian-source.1
        doc/requestbackport.1
        doc/reverse-depends.1
        doc/sponsor-patch.1
        doc/ubuntu-dev-tools.5
        doc/update-maintainer.1
+       doc/ubuntu-safe-to-upload.1
        enforced-editing-wrapper
-       pkg-on-images
        pull-debian-debdiff
        pull-debian-source
        requestbackport
        reverse-depends
        sponsor-patch
        test-data/*
+       ubuntu-safe-to-upload
        ubuntutools/archive.py
        ubuntutools/builder.py
        ubuntutools/config.py
diff --git a/doc/pkg-on-images.1 b/doc/ubuntu-safe-to-upload.1
similarity index 71%
rename from doc/pkg-on-images.1
rename to doc/ubuntu-safe-to-upload.1
index 1ec52b5..4328d35 100644
--- a/doc/pkg-on-images.1
+++ b/doc/ubuntu-safe-to-upload.1
@@ -11,17 +11,23 @@
 .\" 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 pkg\-on\-images 1 "December 2011" ubuntu\-dev\-tools
+.TH ubuntu\-safe\-to\-upload 1 "December 2011" ubuntu\-dev\-tools
 
 .SH NAME
-pkg\-on\-images \- List the all the daily images containing the
-specified packages
+ubuntu\-safe\-to\-upload \- Determine whether a package is safe to
+upload during a freeze
 
 .SH SYNOPSIS
-.B pkg\-on\-images \fR[\fIoptions\fR] \fIpackage\fR...
+.B ubuntu\-safe\-to\-upload \fR[\fIoptions\fR] \fIpackage\fR...
 
 .SH DESCRIPTION
 Lists all the current daily images containing the specified packages.
+Or whether the package is part of the supported seed.
+.PP
+If it isn't on an image, it should be safe to upload.
+During the final freeze, one should avoid packages in the supported seed
+too.
+.PP
 An index of the current manifests is downloaded from UbuntuWire.
 
 .SH OPTIONS
@@ -39,11 +45,11 @@ Display a help message and exit
 All the images that contain unity:
 .IP
 .nf
-.B pkg\-on\-images -b unity
+.B ubuntu\-safe\-to\-upload -b unity
 .fi
 
 .SH AUTHORS
-\fBpkg\-on\-images\fR and this manpage were written by Stefano Rivera
-<stefanor@ubuntu.com>.
+\fBubuntu\-safe\-to\-upload\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 8f1ec4b..b4b1831 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,6 @@ scripts = ['404main',
            'mk-sbuild',
            'pbuilder-dist',
            'pbuilder-dist-simple',
-           'pkg-on-images',
            'pull-debian-debdiff',
            'pull-debian-source',
            'pull-lp-source',
@@ -42,6 +41,7 @@ scripts = ['404main',
            'syncpackage',
            'ubuntu-build',
            'ubuntu-iso',
+           'ubuntu-safe-to-upload',
            'update-maintainer',
           ]
 
diff --git a/pkg-on-images b/ubuntu-safe-to-upload
similarity index 100%
rename from pkg-on-images
rename to ubuntu-safe-to-upload