diff --git a/build/ci-notes.md b/build/ci-notes.md
index cfdf954b29..edd9adc1c2 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -22,20 +22,18 @@ variables `PPA_SIGNING_KEY` and `PPA_SSH_KEY` on Travis.
 
 We want to build go-ethereum with the most recent version of Go, irrespective of the Go
 version that is available in the main Ubuntu repository. In order to make this possible,
-our we depend on ~gophers/ubuntu/archive and ~longsleep/ubuntu/golang-backports PPAs. Our
-source package build-depends on golang-1.11 on Tusty and golang-1.13 on others, which is
-co-installable alongside the regular golang package. PPA dependencies can be edited at
-https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
+we bundle the entire Go sources into our own source archive and start the built job by
+compiling Go and then using that to build go-ethereum. On Trusty we have a special case
+requiring the `~gophers/ubuntu/archive` PPA since Trusty can't even build Go itself. PPA
+deps are set at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
 
 ## Building Packages Locally (for testing)
 
 You need to run Ubuntu to do test packaging.
 
-Add the longsleep PPA and install Go 1.13 and Debian packaging tools:
+Install any version of Go and Debian packaging tools:
 
-    $ sudo apt-add-repository ppa:longsleep/ubuntu/golang-backports
-    $ sudo apt-get update
-    $ sudo apt-get install build-essential golang-1.13 devscripts debhelper python-bzrlib python-paramiko
+    $ sudo apt-get install build-essential golang-go devscripts debhelper python-bzrlib python-paramiko
 
 Create the source packages:
 
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 0786b3d4c7..1370a52f1e 100644
--- a/build/deb/ethereum/deb.rules
+++ b/build/deb/ethereum/deb.rules
@@ -9,7 +9,7 @@ export GOCACHE=/tmp/go-build
 export GOROOT_BOOTSTRAP={{.GoBootPath}}
 
 override_dh_auto_build:
-	(cd .go/src && ./all.bash || true)
+	(cd .go/src && ./make.bash)
 	build/env.sh .go/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
 
 override_dh_auto_test: