diff --git a/debian/copyright b/debian/copyright
index 94baf810..30e2b0ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -94,7 +94,7 @@ Copyright (from the Debian copyright file):
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  for more details.
 
-lib/vendor/spyc/spyc.php is copyright 2005-2006 Chris Wanstrath,
+webapp/vendor/spyc/spyc.php is copyright 2005-2006 Chris Wanstrath,
 2006-2011 Vlad Andersen and licenced under the MIT License.
 
 www/js/ace is copyright (c) 2010, Ajax.org B.V. and licenced under
diff --git a/debian/domjudge-domserver.dirs b/debian/domjudge-domserver.dirs
index b6e05b28..06566a46 100644
--- a/debian/domjudge-domserver.dirs
+++ b/debian/domjudge-domserver.dirs
@@ -1,4 +1,5 @@
 var/cache/domjudge
 var/lib/domjudge/images
+var/log/domjudge/domserver
 usr/share/dbconfig-common/scripts/domjudge-domserver/install
 usr/share/dbconfig-common/scripts/domjudge-domserver/upgrade/mysql
diff --git a/debian/domjudge-domserver.install b/debian/domjudge-domserver.install
index 6f273d9e..b86aeef0 100644
--- a/debian/domjudge-domserver.install
+++ b/debian/domjudge-domserver.install
@@ -1,2 +1,2 @@
-lib/vendor		usr/share/domjudge/lib
+webapp/vendor		usr/share/domjudge/lib
 debian/src/dbpasswords.template usr/share/domjudge
diff --git a/debian/domjudge-domserver.lintian-overrides b/debian/domjudge-domserver.lintian-overrides
index 045c0998..984ddf52 100644
--- a/debian/domjudge-domserver.lintian-overrides
+++ b/debian/domjudge-domserver.lintian-overrides
@@ -1,4 +1,4 @@
-package-contains-vcs-control-file usr/share/domjudge/lib/vendor
-privacy-breach-generic usr/share/domjudge/lib/vendor
-executable-not-elf-or-script usr/share/domjudge/lib/vendor
+package-contains-vcs-control-file usr/share/domjudge/webapp/vendor
+privacy-breach-generic usr/share/domjudge/webapp/vendor
+executable-not-elf-or-script usr/share/domjudge/webapp/vendor
 maintainer-script-needs-depends-on-ucf postinst
diff --git a/debian/rules b/debian/rules
index ae60d2ac..dc1f05a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ build-stamp:
 		--with-domjudge_docdir=\$${prefix}/share/doc/domjudge-doc \
 		\
 		--with-domserver_libdir=\$${prefix}/share/domjudge \
-		--with-domserver_libvendordir=\$${prefix}/share/domjudge/lib/vendor \
+		--with-domserver_libvendordir=\$${prefix}/share/domjudge/webapp/vendor \
 		--with-domserver_webappdir=\$${prefix}/share/domjudge/webapp \
 		--with-domserver_logdir=/var/log/domjudge/domserver \
 		\
@@ -89,17 +89,13 @@ install: build
 		mv teams affiliations ../../../../../../var/lib/domjudge/images/
 
 	# Remove so they can be symlinked to system dirs
-	rm -r $(DJDS)/usr/share/domjudge/webapp/var/cache \
+	rm -rf $(DJDS)/usr/share/domjudge/webapp/var/cache \
 		$(DJDS)/usr/share/domjudge/webapp/var/log
 
 	# Makes no sense to include passwords generated on .deb build host
-	rm $(DJDS)/etc/domjudge/*.secret $(DJJH)/etc/domjudge/restapi.secret \
+	rm -f $(DJDS)/etc/domjudge/*.secret $(DJJH)/etc/domjudge/restapi.secret \
 		$(DJDS)/etc/domjudge/gendbpasswords
 
-	# Needs to be web-writable:
-	chgrp www-data $(DJDS)/var/log/domjudge/domserver $(DJDS)/var/cache/domjudge
-	chmod 0770 $(DJDS)/var/log/domjudge/domserver $(DJDS)/var/cache/domjudge
-
 	# Fixup sudoers file to match our assumptions for user/chroot location
 	sed -i 's#^root #domjudge #;s# root\\:# domjudge\\:#' $(DJJH)/etc/domjudge/sudoers-domjudge
 	sed -i 's#/\*/proc#/var/lib/domjudge/chroot*/proc#' $(DJJH)/etc/domjudge/sudoers-domjudge
@@ -113,6 +109,11 @@ install: build
 	cp -a debian/src/db_upgrade \
 		$(DJDS)/usr/share/dbconfig-common/scripts/domjudge-domserver/upgrade/mysql/$(DEB_VERSION)
 
+override_dh_fixperms:
+	dh_fixperms -i -X var/cache/domjudge -X var/log/domjudge -X var/lib/domjudge
+	chown :www-data debian/domjudge-domserver/var/log/domjudge/domserver
+	chown :www-data debian/domjudge-domserver/var/cache/domjudge
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
@@ -125,7 +126,6 @@ binary-indep: build install
 	dh_lintian -i
 	dh_link -i
 	dh_compress -i -X .pdf
-	dh_fixperms -i -X var/cache/domjudge -X var/log/domjudge -X var/lib/domjudge
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index a9e5e23c..9ea60c54 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,3 @@
 source-is-missing
 build-depends-on-python-sphinx-only
-source-contains-prebuilt-windows-binary lib/vendor/symfony/console/Resources/bin/hiddeninput.exe
+source-contains-prebuilt-windows-binary webapp/vendor/symfony/console/Resources/bin/hiddeninput.exe