diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,15 @@
 # './setup.py install', or
 # './setup.py --help' for more options
 
+import glob
 from distutils.core import setup, Extension
+from distutils.command.install_data import install_data
+
+class install_package_data(install_data):
+    def finalize_options(self):
+        self.set_undefined_options('install',
+                                   ('install_lib', 'install_dir'))
+        install_data.finalize_options(self)
 
 setup(name='mercurial',
       version='0.4f',
@@ -16,4 +24,7 @@ setup(name='mercurial',
       license='GNU GPL',
       packages=['mercurial'],
       ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])],
+      data_files=[('mercurial/templates',
+                   ['templates/map'] + glob.glob('templates/*.tmpl'))], 
+      cmdclass = { 'install_data' : install_package_data },
       scripts=['hg'])