diff --git a/contrib/wix/dist.wxs b/contrib/wix/dist.wxs
--- a/contrib/wix/dist.wxs
+++ b/contrib/wix/dist.wxs
@@ -7,24 +7,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi
+++ b/contrib/wix/guids.wxi
@@ -9,7 +9,8 @@
-
+
+
diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -118,6 +118,7 @@
Level='1' Absent='disallow' >
+
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -557,6 +557,8 @@ if py2exeloaded:
'product_version':version}]
# sub command of 'build' because 'py2exe' does not handle sub_commands
build.sub_commands.insert(0, ('build_hgextindex', None))
+ # put dlls in sub directory so that they won't pollute PATH
+ extra['zipfile'] = 'lib/library.zip'
if os.name == 'nt':
# Windows binary file versions for exe/dll files must have the