diff --git a/Makefile b/Makefile
index 29463068..8d24b294 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ LongPackage  := gemplotting
 PackageName  := $(Namespace)_$(ShortPackage)
 PackageDir   := pkg/$(Namespace)/$(ShortPackage)
 ScriptDir    := pkg/$(Namespace)/scripts
+ManDir       := pkg/man
 
 # Explicitly define the modules that are being exported (for PEP420 compliance)
 PythonModules = ["$(Namespace).$(ShortPackage)", \
@@ -45,7 +46,7 @@ default:
 # need to ensure that the python only stuff is packaged into RPMs
 .PHONY: clean preprpm
 _rpmprep: preprpm
-preprpm: default
+preprpm: default man
 	@if ! [ -e pkg/installrpm.sh ]; then \
 		cp -rf config/scriptlets/installrpm.sh pkg/; \
 	fi
@@ -56,12 +57,15 @@ preprpm: default
 	@cp -rf ana_scans.py $(ScriptDir)
 	@cp -rf anaXDAQLatency.py $(ScriptDir)
 	@cp -rf packageFiles4Docker.py $(ScriptDir)
+	$(MakeDir) $(ManDir)
+	@cp -rf doc/_build/man/* $(ManDir)
 	-cp -rf README.md LICENSE CHANGELOG.md MANIFEST.in requirements.txt $(PackageDir)
 	-cp -rf README.md LICENSE CHANGELOG.md MANIFEST.in requirements.txt pkg
 
 clean:
 	-rm -rf $(ScriptDir)
 	-rm -rf $(PackageDir)
+	-rm -rf $(ManDir)
 	-rm -f  pkg/$(Namespace)/__init__.py
 	-rm -f  pkg/README.md
 	-rm -f  pkg/LICENSE
diff --git a/pkg/setup.py b/pkg/setup.py
index 3269a243..0eb5610b 100644
--- a/pkg/setup.py
+++ b/pkg/setup.py
@@ -7,6 +7,7 @@
 scriptdir  = 'gempython/scripts'
 scriptpath = '/opt/cmsgemos/bin'
 scripts    = listdir(scriptdir)
+mandir     = 'man'
 
 def readme():
     with open('README.md') as f:
@@ -53,6 +54,20 @@ def getVersion():
 """.format(__version__,__release__,__buildtag__,__gitrev__,__gitver__,__packager__,__builddate__))
     return '{0:s}'.format(__version__)
 
+def getdatafiles():
+    data_files = []
+
+    # Man files
+    man_sections = {}
+    for file in listdir(mandir):
+        print('Found man page: %s' % file)
+        section = file.split('.')[-1]
+        man_sections[section] = man_sections.get(section, []) + [join(mandir, file)]
+    for section in man_sections:
+        data_files.append(('share/man/man%s' % section, man_sections[section]))
+
+    return data_files
+
 setup(name             = '__packagename__',
       version          = getVersion(),
       # use_scm_version  = True,
@@ -66,6 +81,7 @@ def getVersion():
       url              = 'https://cms-gem-daq-project.github.io/gem-plotting-tools',
       # namespace_package = "gempython",
       # packages         = __pythonmodules__, # for PEP420 native namespace util
+      data_files       = getdatafiles(),
       packages           = find_packages(), # for pkgutil namespace method
       include_package_data = True,
       package_data     = getpkgdata(),