diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
index 32ce2c5d4d25ec4f0f1f7ac00ff09217147fa6f5_bWVyY3VyaWFsL2hnd2ViLnB5..2653740d811892ea471bd70441b8c8f31e40105d_bWVyY3VyaWFsL2hnd2ViLnB5 100644
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -13,6 +13,11 @@
 import os, cgi, time, re, difflib, sys, zlib
 from mercurial.hg import *
 
+def templatepath():
+    for f in "templates/map", "../templates/map":
+        p = os.path.join(os.path.dirname(__file__), f)
+        if os.path.isfile(p): return p
+
 def age(t):
     def plural(t, c):
         if c == 1: return t
@@ -102,7 +107,9 @@
     maxchanges = 20
     maxfiles = 10
 
-    def __init__(self, path, name, templatemap):
+    def __init__(self, path, name, templatemap = ""):
+        templatemap = templatemap or templatepath()
+
         self.reponame = name
         self.repo = repository(ui(), path)
         self.t = templater(templatemap)
diff --git a/setup.py b/setup.py
index 32ce2c5d4d25ec4f0f1f7ac00ff09217147fa6f5_c2V0dXAucHk=..2653740d811892ea471bd70441b8c8f31e40105d_c2V0dXAucHk= 100644
--- a/setup.py
+++ b/setup.py
@@ -5,4 +5,5 @@
 # './setup.py install', or
 # './setup.py --help' for more options
 
+import glob
 from distutils.core import setup, Extension
@@ -8,4 +9,11 @@
 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 @@
       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'])