--- a/src/pkg/manifests/consolidation:ips:ips-message-files.p5m	Fri Feb 26 17:32:03 2016 -0800
+++ b/src/pkg/manifests/consolidation:ips:ips-message-files.p5m	Tue Mar 01 10:40:55 2016 +0900
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -59,4 +59,25 @@
 dir  path=usr/share/locale/__LOCALE__
 dir  path=usr/share/locale/__LOCALE__/LC_MESSAGES
 file path=usr/share/locale/__LOCALE__/LC_MESSAGES/pkg.pot
+dir  path=usr/share/man
+dir  path=usr/share/man/__LOCALE__
+dir  path=usr/share/man/__LOCALE__/man1
+file path=usr/share/man/__LOCALE__/man1/pkg.1
+file path=usr/share/man/__LOCALE__/man1/pkgdepend.1
+file path=usr/share/man/__LOCALE__/man1/pkgdiff.1
+file path=usr/share/man/__LOCALE__/man1/pkgfmt.1
+file path=usr/share/man/__LOCALE__/man1/pkglint.1
+file path=usr/share/man/__LOCALE__/man1/pkgmerge.1
+file path=usr/share/man/__LOCALE__/man1/pkgmogrify.1
+file path=usr/share/man/__LOCALE__/man1/pkgrecv.1
+file path=usr/share/man/__LOCALE__/man1/pkgrepo.1
+file path=usr/share/man/__LOCALE__/man1/pkgsend.1
+file path=usr/share/man/__LOCALE__/man1/pkgsign.1
+file path=usr/share/man/__LOCALE__/man1/pkgsurf.1
+dir  path=usr/share/man/__LOCALE__/man1m
+file path=usr/share/man/__LOCALE__/man1m/pkg.depot-config.1m
+file path=usr/share/man/__LOCALE__/man1m/pkg.depotd.1m
+file path=usr/share/man/__LOCALE__/man1m/pkg.sysrepo.1m
+dir  path=usr/share/man/__LOCALE__/man5
+file path=usr/share/man/__LOCALE__/man5/pkg.5
 license cr_Oracle license=cr_Oracle

--- a/src/setup.py	Fri Feb 26 17:32:03 2016 -0800
+++ b/src/setup.py	Tue Mar 01 10:40:55 2016 +0900
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 from __future__ import print_function
@@ -242,7 +242,8 @@
         "unknown": scripts_sunos,
         }
 
-MANPAGE_OUTPUT_ROOT = "man/nroff"
+MANPAGE_SRC_ROOT = "man"
+MANPAGE_OUTPUT_ROOT = MANPAGE_SRC_ROOT + "/nroff"
 
 man1_files = [
     MANPAGE_OUTPUT_ROOT + '/man1/' + f
@@ -1657,17 +1658,23 @@
         }
 
 # all builds of IPS should have manpages
-data_files += [
+english_manpage_files = [
         (man1_dir, man1_files),
         (man1m_dir, man1m_files),
         (man5_dir, man5_files),
+        ]
+data_files += english_manpage_files
+data_files += [
         (man1_ja_JP_dir, man1_ja_files),
         (man1m_ja_JP_dir, man1m_ja_files),
         (man5_ja_JP_dir, man5_ja_files),
         (man1_zh_CN_dir, man1_zh_CN_files),
         (man1m_zh_CN_dir, man1m_zh_CN_files),
         (man5_zh_CN_dir, man5_zh_CN_files),
-        (resource_dir, resource_files),
+        ]
+# add resource files
+data_files += [
+        (resource_dir, resource_files)
         ]
 # add transforms
 data_files += [
@@ -1707,6 +1714,13 @@
             (os.path.join(locale_dir, '__LOCALE__', 'LC_MESSAGES'),
                 [('po/pkg.pot', 'pkg.pot')])
         ]
+        # install English manpage sources to put into localizable file package
+        data_files += [
+            (dir.replace('usr/share/man/', 'usr/share/man/__LOCALE__/'),
+                (os.path.join(MANPAGE_SRC_ROOT, os.path.basename(f))
+                 for f in files))
+             for dir, files in english_manpage_files
+        ]
 
 if osname == 'sunos' or osname == "linux":
         # Unix platforms which the elf extension has been ported to