diff --git a/debian/control b/debian/control
index 3db962eba154b4e898f9b8310bb483c43768cd7e..96747a49d2119d83c558bc09436e3775fab5ff52 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: float-debug-proxy
 Section: net
 Priority: extra
 Maintainer: Autistici/Inventati <debian@autistici.org>
-Build-Depends: debhelper (>= 8.0.0), golang-go, dh-golang, dh-systemd
+Build-Depends: debhelper (>= 8.0.0), golang-any (>= 1.11), dh-golang, dh-systemd
 Standards-Version: 3.9.4
 
 Package: float-debug-proxy
diff --git a/debian/copyright b/debian/copyright
index e1cae0d359528c9ba2922f17dba5a2a5fc0fab62..847a2039c25e95c669a79425f9dc1b47f019a325 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: float-debug-proxy
-Source: <https://git.autistici.org/ai3/float-debug-proxy>
+Source: <https://git.autistici.org/ai3/tools/float-debug-proxy>
 
 Files: *
 Copyright: 2018 Autistici/Inventati <debian@autistici.org>
diff --git a/debian/rules b/debian/rules
index 95e32d5b5ccf942f8ddfa4edbef7e2739805ae73..bac1440db5f505cdc1fa4c61319cbcf44fd4674d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-export DH_GOPKG = git.autistici.org/ai3/float-debug-proxy
+export DH_GOPKG = git.autistici.org/ai3/tools/float-debug-proxy
 export DH_GOLANG_EXCLUDES = vendor
 
 %:
@@ -12,7 +12,7 @@ export DH_GOLANG_EXCLUDES = vendor
 
 override_dh_auto_test:
 
-override_dh_install:
-	rm -fr $(CURDIR)/debian/float-debug-proxy/usr/share/gocode
-	dh_install
+override_dh_auto_install:
+	dh_auto_install
+	$(RM) -rv debian/float-debug-proxy/usr/share/gocode
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 66903c7705e820b722a146b971e3acaddc8de8ed..5b63ea7d66839617268733aab03398ad52b716b7 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -70,5 +70,5 @@
 			"revisionTime": "2018-08-30T06:41:33Z"
 		}
 	],
-	"rootPath": "git.autistici.org/ai3/float-debug-proxy"
+	"rootPath": "git.autistici.org/ai3/tools/float-debug-proxy"
 }