diff --git a/contrib/bash_completion b/contrib/bash/hg
rename from contrib/bash_completion
rename to contrib/bash/hg
diff --git a/contrib/zsh_completion b/contrib/zsh/_hg
rename from contrib/zsh_completion
rename to contrib/zsh/_hg
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -263,7 +263,16 @@ for root in ('templates', ):
             f = os.path.join(curdir, f)
             packagedata['mercurial'].append(f)
 
-datafiles = []
+datafiles = [
+    ('share/bash_completion.d', ['contrib/bash/hg']),
+    ('share/zsh/site-functions', ['contrib/zsh/_hg']),
+    ('share/mercurial/www', ['hgweb.cgi',
+                             'hgwebdir.cgi',
+                             'contrib/hgwebdir.fcgi',
+                             'contrib/hgwebdir.wsgi']),
+    ('share/mercurial/examples', ['contrib/sample.hgrc',
+                                  'contrib/mergetools.hgrc']),
+]
 
 setup(name='mercurial',
       version=version,