diff --git a/.gitignore b/.gitignore
index 7258b64..0c000d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ debianized-devpi/debian/devpi/
 debianized-devpi/debian/files
 debianized-devpi/debian/sdist/
 debianized-devpi/debian/debhelper-build-stamp
+debianized-devpi/debian/.debhelper/
 devpi_*.changes
 devpi_*.deb
 devpi_*.upload
diff --git a/debianized-devpi/debian/changelog b/debianized-devpi/debian/changelog
index f473a21..3ce39b2 100644
--- a/debianized-devpi/debian/changelog
+++ b/debianized-devpi/debian/changelog
@@ -1,3 +1,10 @@
+devpi (4.0.0-3~xenial) xenial; urgency=high
+
+  * Move installation root directory to "/opt/venvs" (fix
+    upgrade problems for Python2 due to misplaced Python3 code)
+
+ -- Juergen Hermann <jh@web.de>  Mon, 12 Mar 2018 16:56:59 +0100
+
 devpi (4.0.0-2~xenial) xenial; urgency=high
 
   * Xenial build (with Python3)
diff --git a/debianized-devpi/debian/devpi.links b/debianized-devpi/debian/devpi.links
index a80b60c..5252808 100644
--- a/debianized-devpi/debian/devpi.links
+++ b/debianized-devpi/debian/devpi.links
@@ -1,2 +1,2 @@
-usr/share/python/devpi/bin/devpi usr/bin/devpi
-usr/share/python/devpi/bin/devpi-server usr/sbin/devpi-server
+opt/venvs/devpi/bin/devpi usr/bin/devpi
+opt/venvs/devpi/bin/devpi-server usr/sbin/devpi-server
diff --git a/debianized-devpi/debian/rules b/debianized-devpi/debian/rules
index 71e8c4b..9dc73c2 100755
--- a/debianized-devpi/debian/rules
+++ b/debianized-devpi/debian/rules
@@ -11,6 +11,8 @@
 # sourcedir ".", because that includes the debian build stage,
 # and a recursive explosion ensues when symlinks are followed.
 
+export DH_VIRTUALENV_INSTALL_ROOT=/opt/venvs
+
 # Packages to install before the main project
 PREINSTALL=--preinstall "setuptools>=17.1" --preinstall "pip>8" --preinstall "wheel" \
     --preinstall pytest --preinstall webtest