diff --git a/debian/control b/debian/control
index c7fd55ab..cf1723e0 100644
--- a/debian/control
+++ b/debian/control
@@ -83,13 +83,46 @@ Homepage: https://www.aptly.info
 Vcs-Git: https://github.com/aptly-dev/aptly.git
 Vcs-Browser: https://github.com/aptly-dev/aptly
 XS-Go-Import-Path: github.com/aptly-dev/aptly
+Testsuite: autopkgtest-pkg-go
 
 Package: aptly
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, adduser, gpg (>= 2.2.12)
+Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, gpgv, gpg
+Suggests: graphviz
+Conflicts: gnupg1, gpgv1
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
-Description: Debian repository management tool
- aptly is a Swiss army knife for Debian repository management.
+Description: Swiss army knife for Debian repository management - main package
+ It offers several features making it easy to manage Debian package
+ repositories:
+ .
+  - make mirrors of remote Debian/Ubuntu repositories, limiting by
+    components/architectures
+  - take snapshots of mirrors at any point in time, fixing state of
+    repository at some moment of time
+  - publish snapshot as Debian repository, ready to be consumed by apt
+  - controlled update of one or more packages in snapshot from upstream
+    mirror, tracking dependencies
+  - merge two or more snapshots into one
+ .
+ This is the main package, it contains the aptly command-line utility.
+
+Package: aptly-api
+Architecture: any
+Depends: ${misc:Depends}, aptly
+Description: Swiss army knife for Debian repository management - API
+ It offers several features making it easy to manage Debian package
+ repositories:
+ .
+  - make mirrors of remote Debian/Ubuntu repositories, limiting by
+    components/architectures
+  - take snapshots of mirrors at any point in time, fixing state of
+    repository at some moment of time
+  - publish snapshot as Debian repository, ready to be consumed by apt
+  - controlled update of one or more packages in snapshot from upstream
+    mirror, tracking dependencies
+  - merge two or more snapshots into one
+ .
+ This package contains the aptly-api service.
 
 Package: aptly-dbg
 Architecture: any
@@ -97,9 +130,3 @@ Depends: ${misc:Depends}
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Debian repository management tool (debug files)
  Debug symbols for aptly
-
-Package: aptly-api
-Architecture: all
-Depends: ${misc:Depends}, aptly
-Description: Debian repository management tool (REST API server)
- systemd service and configuration for aptly
diff --git a/debian/rules b/debian/rules
index 43a5fc96..1f8bcddd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ override_dh_auto_clean:
 	rm -rf obj-$(DEB_TARGET_GNU_TYPE)/
 	dh_auto_clean
 
-override_dh_auto_test:  # disabled
+override_dh_auto_test:
+	# run during autopkgtests
 
 override_dh_auto_install:
 	dh_auto_install -- --no-source
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 00000000..0ae1d291
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+# This file is an addition to the autodep8 tests.
+
+Test-Command: HOME=/tmp aptly repo create autopkgtest
+Restrictions: allow-stderr
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..7571c2d7
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/aptly-dev/aptly/issues
+Bug-Submit: https://github.com/aptly-dev/aptly/issues/new
+Repository: https://github.com/aptly-dev/aptly.git
+Repository-Browse: https://github.com/aptly-dev/aptly
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..2c6231d2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=4
+opts=\
+repacksuffix=+ds1,\
+dversionmangle=s/\+ds\d*$// \
+https://github.com/aptly-dev/aptly/tags .*/v(\d[\d\.]*)\.tar\.gz debian uupdate