diff --git a/cmd/acmeserver/acmeserver.go b/cmd/acmeserver/acmeserver.go
index 9406dc802e7268c17a3cc9a4c89546cdd6a6eee7..38339ed8f4b29ec5378533c45f8c2b1156acca3f 100644
--- a/cmd/acmeserver/acmeserver.go
+++ b/cmd/acmeserver/acmeserver.go
@@ -10,7 +10,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"git.autistici.org/ai3/acmeserver"
+	"git.autistici.org/ai3/tools/acmeserver"
 	"git.autistici.org/ai3/go-common/serverutil"
 	"gopkg.in/yaml.v2"
 )
diff --git a/debian/copyright b/debian/copyright
index f268beb0ca82d99554bca88682adfa6854bab979..5a33ccccc882b754e53879f5b9c7a22a77c68ecb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: acmeserver
-Source: <https://git.autistici.org/ai3/acmeserver>
+Source: <https://git.autistici.org/ai3/tools/acmeserver>
 
 Files: *
 Copyright: 2018 Autistici/Inventati <info@autistici.org>
diff --git a/debian/rules b/debian/rules
index 27dc78b9effeb51cc6c52611de51aa97f0897f12..9380a33440949bd3dc45895af37169d37569f76b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_GOPKG = git.autistici.org/ai3/acmeserver
+export DH_GOPKG = git.autistici.org/ai3/tools/acmeserver
 export DH_GOLANG_EXCLUDES = vendor
 
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index d622536eb23e6df3e466ced9276e29bd8e60e957..18625a2718d70e64e464e2f1f13a90349261e7e0 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -195,5 +195,5 @@
 			"revisionTime": "2018-03-28T19:50:20Z"
 		}
 	],
-	"rootPath": "git.autistici.org/ai3/acmeserver"
+	"rootPath": "git.autistici.org/ai3/tools/acmeserver"
 }