diff -Nru acbuild-0.4.0+dfsg/debian/changelog acbuild-0.4.0+dfsg/debian/changelog
--- acbuild-0.4.0+dfsg/debian/changelog	2018-01-31 08:52:49.000000000 +0000
+++ acbuild-0.4.0+dfsg/debian/changelog	2018-06-23 04:22:11.000000000 +0000
@@ -1,3 +1,15 @@
+acbuild (0.4.0+dfsg-3) unstable; urgency=medium
+
+  [ Alexandre Viau ]
+  * Point Vcs-* urls to salsa.debian.org.
+
+  [ Dmitry Smirnov ]
+  * golang-go.crypto-dev --> golang-golang-x-crypto-dev (Closes: #901491).
+  * Standards-Version: 4.1.4; Priority: optional
+  * debhelper & compat to version 11
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sat, 23 Jun 2018 14:22:11 +1000
+
 acbuild (0.4.0+dfsg-2) unstable; urgency=medium
 
   * rkt-dev was renamed (Closes: #888922)
diff -Nru acbuild-0.4.0+dfsg/debian/compat acbuild-0.4.0+dfsg/debian/compat
--- acbuild-0.4.0+dfsg/debian/compat	2018-01-31 08:52:49.000000000 +0000
+++ acbuild-0.4.0+dfsg/debian/compat	2018-06-23 04:21:11.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru acbuild-0.4.0+dfsg/debian/control acbuild-0.4.0+dfsg/debian/control
--- acbuild-0.4.0+dfsg/debian/control	2018-01-31 08:52:49.000000000 +0000
+++ acbuild-0.4.0+dfsg/debian/control	2018-06-23 04:21:08.000000000 +0000
@@ -1,9 +1,9 @@
 Source: acbuild
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: pkg-go <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Dmitry Smirnov <onlyjob@debian.org>
-Build-Depends: debhelper (>= 9), dh-golang
+Build-Depends: debhelper (>= 11~), dh-golang
     ,golang-go
     ,golang-github-appc-docker2aci-dev
     ,golang-github-appc-spec-dev (>= 0.8.5~)
@@ -11,13 +11,13 @@
     ,golang-github-rkt-rkt-dev (>= 1.8.0~) | golang-github-coreos-rkt-dev (>= 1.8.0~)
     ,golang-github-kylelemons-godebug-dev
     ,golang-github-spf13-cobra-dev
-    ,golang-go.crypto-dev
+    ,golang-golang-x-crypto-dev
     ,golang-golang-x-net-dev
     ,golang-xi2-x-xz-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.4
 Homepage: https://github.com/appc/acbuild
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/acbuild.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/acbuild.git
+Vcs-Browser: https://salsa.debian.org/go-team/packages/acbuild
+Vcs-Git: https://salsa.debian.org/go-team/packages/acbuild.git
 XS-Go-Import-Path: github.com/appc/acbuild
 
 Package: acbuild
diff -Nru acbuild-0.4.0+dfsg/debian/copyright acbuild-0.4.0+dfsg/debian/copyright
--- acbuild-0.4.0+dfsg/debian/copyright	2018-01-31 08:52:49.000000000 +0000
+++ acbuild-0.4.0+dfsg/debian/copyright	2018-06-23 04:22:11.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: acbuild
 Source: https://github.com/appc/acbuild
 Files-Excluded:
@@ -40,7 +40,7 @@
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2015-2016 Dmitry Smirnov <onlyjob@debian.org>
+Copyright: 2015-2018 Dmitry Smirnov <onlyjob@debian.org>
 License: GPL-3+
 
 Files: debian/patches/*
diff -Nru acbuild-0.4.0+dfsg/debian/gitlab-ci.yml acbuild-0.4.0+dfsg/debian/gitlab-ci.yml
--- acbuild-0.4.0+dfsg/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ acbuild-0.4.0+dfsg/debian/gitlab-ci.yml	2018-05-28 13:22:00.000000000 +0000
@@ -0,0 +1,28 @@
+
+# auto-generated, DO NOT MODIFY.
+# The authoritative copy of this file lives at:
+# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go
+
+# TODO: publish under debian-go-team/ci
+image: stapelberg/ci2
+
+test_the_archive:
+  artifacts:
+    paths:
+    - before-applying-commit.json
+    - after-applying-commit.json
+  script:
+    # Create an overlay to discard writes to /srv/gopath/src after the build:
+    - "rm -rf /cache/overlay/{upper,work}"
+    - "mkdir -p /cache/overlay/{upper,work}"
+    - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src"
+    - "export GOPATH=/srv/gopath"
+    - "export GOCACHE=/cache/go"
+    # Build the world as-is:
+    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json"
+    # Copy this package into the overlay:
+    - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'"
+    - "pgt-gopath -dsc /tmp/export/*.dsc"
+    # Rebuild the world:
+    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json"
+    - "ci-diff before-applying-commit.json after-applying-commit.json"