diff --git a/debian/control b/debian/control
index a212b36e8..6c4463c9d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  check,
  debhelper (>= 9),
  dh-autoreconf,
+ dh-python,
  gettext,
  krb5-user,
  libcmocka-dev,
@@ -47,15 +48,14 @@ Build-Depends:
  python-qrcode,
  python-setuptools,
  python-sss (>= 1.8.0),
- python-support,
  python-yubico,
  quilt,
  rhino,
  samba-dev,
  selinux-policy-dev,
  uuid-dev
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-freeipa/freeipa.git
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/pkg-freeipa/freeipa.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-freeipa/freeipa.git
 Homepage: http://www.freeipa.org
 
@@ -76,6 +76,8 @@ Depends:
  libapache2-mod-auth-kerb,
  libapache2-mod-nss,
  libapache2-mod-wsgi,
+ libjs-dojo-core,
+ libjs-jquery,
  libnss3-tools,
  libsasl2-modules-gssapi-mit,
  ntp,
@@ -107,7 +109,8 @@ Depends:
  samba,
  winbind,
  ${misc:Depends},
- ${python:Depends}
+ ${python:Depends},
+ ${shlibs:Depends}
 Description: FreeIPA centralized identity framework -- AD trust installer
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -167,7 +170,7 @@ Description: FreeIPA centralized identity framework -- admintools
 
 Package: freeipa-tests
 Architecture: any
-Depends: tar, xz, ${misc:Depends}, ${python:Depends}
+Depends: xz, ${misc:Depends}, ${python:Depends}
 Description: FreeIPA centralized identity framework -- tests
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install
index 8e24e2386..9599d703f 100644
--- a/debian/freeipa-server.install
+++ b/debian/freeipa-server.install
@@ -1,11 +1,13 @@
 etc/ipa/html/*
 lib/systemd/system/ipa-otpd.socket
 lib/systemd/system/ipa-otpd@.service
+usr/lib/*/certmonger/dogtag-ipa-ca-renew-agent-submit
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
 usr/lib/*/dirsrv/plugins/libipa_lockout.so
 usr/lib/*/dirsrv/plugins/libipa_modrdn.so
+usr/lib/*/dirsrv/plugins/libipa_otp_lasttoken.so
 usr/lib/*/dirsrv/plugins/libipa_pwd_extop.so
 usr/lib/*/dirsrv/plugins/libipa_range_check.so
 usr/lib/*/dirsrv/plugins/libipa_repl_version.so
@@ -14,7 +16,29 @@ usr/lib/*/dirsrv/plugins/libipa_winsync.so
 usr/lib/*/ipa-otpd
 usr/lib/*/ipa/certmonger/*
 usr/lib/*/krb5/plugins/kdb/*.so
-usr/lib/python*/dist-packages/ipaserver/*
+usr/lib/python*/dist-packages/ipaserver/advise/*
+usr/lib/python*/dist-packages/ipaserver/install/__init__.py
+usr/lib/python*/dist-packages/ipaserver/install/bindinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/cainstance.py
+usr/lib/python*/dist-packages/ipaserver/install/certs.py
+usr/lib/python*/dist-packages/ipaserver/install/dsinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/httpinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/installutils.py
+usr/lib/python*/dist-packages/ipaserver/install/ipa_*.py
+usr/lib/python*/dist-packages/ipaserver/install/krbinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/ldapupdate.py
+usr/lib/python*/dist-packages/ipaserver/install/memcacheinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/ntpinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/otpdinstance.py
+usr/lib/python*/dist-packages/ipaserver/install/plugins
+usr/lib/python*/dist-packages/ipaserver/install/replication.py
+usr/lib/python*/dist-packages/ipaserver/install/schemaupdate.py
+usr/lib/python*/dist-packages/ipaserver/install/service.py
+usr/lib/python*/dist-packages/ipaserver/install/sysupgrade.py
+usr/lib/python*/dist-packages/ipaserver/install/upgradeinstance.py
+usr/lib/python*/dist-packages/ipaserver/plugins/*
+usr/lib/python*/dist-packages/ipaserver/__init__*
+usr/lib/python*/dist-packages/ipaserver/rpcserver*
 usr/sbin/ipa-advise
 usr/sbin/ipa-backup
 usr/sbin/ipa-ca-install
@@ -24,6 +48,7 @@ usr/sbin/ipa-dns-install
 usr/sbin/ipa-ldap-updater
 usr/sbin/ipa-managed-entries
 usr/sbin/ipa-nis-manage
+usr/sbin/ipa-otptoken-import
 usr/sbin/ipa-replica-conncheck
 usr/sbin/ipa-replica-install
 usr/sbin/ipa-replica-manage
@@ -56,6 +81,7 @@ usr/share/man/man1/ipa-dns-install.1*
 usr/share/man/man1/ipa-ldap-updater.1*
 usr/share/man/man1/ipa-managed-entries.1*
 usr/share/man/man1/ipa-nis-manage.1*
+usr/share/man/man1/ipa-otptoken-import.1*
 usr/share/man/man1/ipa-replica-conncheck.1*
 usr/share/man/man1/ipa-replica-install.1*
 usr/share/man/man1/ipa-replica-manage.1*
diff --git a/debian/freeipa-tests.install b/debian/freeipa-tests.install
index 2ee344dcd..877eb8985 100644
--- a/debian/freeipa-tests.install
+++ b/debian/freeipa-tests.install
@@ -2,6 +2,7 @@ usr/bin/ipa-run-tests
 usr/bin/ipa-test-config
 usr/bin/ipa-test-task
 usr/lib/python*/dist-packages/ipatests/*
+usr/lib/python*/dist-packages/ipatests-*
 usr/share/man/man1/ipa-run-tests.1*
 usr/share/man/man1/ipa-test-config.1*
 usr/share/man/man1/ipa-test-task.1*
diff --git a/debian/rules b/debian/rules
index 856e9df32..b159e06ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,13 @@ ifneq ($(ONLY_CLIENT), 1)
 
 	mkdir -p $(DESTDIR)/etc/bash_completion.d
 	install -m 0644 contrib/completion/ipa.bash_completion $(DESTDIR)/etc/bash_completion.d/ipa
+
+	chmod 755 $(DESTDIR)/usr/lib/*/ipa/certmonger/*
+
+	rm -f $(DESTDIR)/usr/share/ipa/ui/js/dojo/dojo.js \
+		$(DESTDIR)/usr/share/ipa/ui/js/libs/jquery.js
+	ln -s /usr/share/javascript/dojo/dojo.js $(DESTDIR)/usr/share/ipa/ui/js/dojo/dojo.js
+	ln -s /usr/share/javascript/jquery/jquery.js $(DESTDIR)/usr/share/ipa/ui/js/libs/jquery.js
 else
 	make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client-install DESTDIR=$(DESTDIR)
 endif
@@ -74,7 +81,7 @@ endif
 	# fix permissions
 	find $(CURDIR)/debian/tmp -name "*.mo" -type f -exec chmod -x "{}" \;
 
-	dh_install --list-missing
+	dh_install --fail-missing
 
 %:
 	dh $@ --with quilt,autoreconf,python2