--- a/src/setup.py	Fri Feb 25 14:00:12 2011 -0800
+++ b/src/setup.py	Fri Feb 25 15:05:38 2011 -0800
@@ -200,6 +200,7 @@
                 ['util/publish/pkgdiff.py', 'pkgdiff'],
                 ['util/publish/pkgfmt.py', 'pkgfmt'],
                 ['util/publish/pkglint.py', 'pkglint'],
+                ['util/publish/pkgmerge.py', 'pkgmerge'],
                 ['util/publish/pkgmogrify.py', 'pkgmogrify'],
                 ['publish.py', 'pkgsend'],
                 ['pull.py', 'pkgrecv'],
@@ -271,6 +272,7 @@
         'man/pkgdiff.1',
         'man/pkgfmt.1',
         'man/pkglint.1',
+        'man/pkgmerge.1',
         'man/pkgmogrify.1',
         'man/pkgsend.1',
         'man/pkgsign.1',