diff --git a/debian/control b/debian/control
index 2984938e618471105f4f0e90c708b94291b9348c..3edeec773217b51eaad838f242a77149538bbd81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,35 +2,40 @@ Source: libvirt-dbus
 Section: admin
 Priority: optional
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org>
-Uploaders: Andrea Bolognani <eof@kiyuko.org>
+Uploaders:
+ Andrea Bolognani <eof@kiyuko.org>,
 Homepage: https://libvirt.org/
 Vcs-Git: https://salsa.debian.org/libvirt-team/libvirt-dbus.git
 Vcs-Browser: https://salsa.debian.org/libvirt-team/libvirt-dbus
-Build-Depends: debhelper-compat (= 13),
-               meson,
-               pkg-config,
-               libvirt-dev (>= 3.0.0),
-               libglib2.0-dev (>= 2.44.0),
-               libvirt-glib-1.0-dev (>= 0.0.7),
-               dbus <!nocheck>,
-               python3:any,
-               python3-gi <!nocheck>,
-               python3-dbus <!nocheck>,
-               python3-docutils,
-               python3-pytest <!nocheck>,
+Build-Depends:
+ dbus <!nocheck>,
+ debhelper-compat (= 13),
+ devscripts <!nocheck>,
+ libglib2.0-dev (>= 2.44.0),
+ libvirt-dev (>= 3.0.0),
+ libvirt-glib-1.0-dev (>= 0.0.7),
+ meson,
+ pkg-config,
+ python3-dbus <!nocheck>,
+ python3-debian <!nocheck>,
+ python3-docutils,
+ python3-gi <!nocheck>,
+ python3-pytest <!nocheck>,
+ python3:any,
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 
 Package: libvirt-dbus
 Architecture: any
-Depends: dbus,
-         default-dbus-session-bus | dbus-session-bus,
-         policykit-1,
-         libvirt-daemon,
-         libvirt-daemon-system,
-         adduser,
-         ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ adduser,
+ dbus,
+ default-dbus-session-bus | dbus-session-bus,
+ libvirt-daemon,
+ libvirt-daemon-system,
+ policykit-1,
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: libvirt D-Bus API bindings
  Libvirt is a C toolkit to interact with the virtualization
  capabilities of recent versions of Linux (and other OSes). The
diff --git a/debian/rules b/debian/rules
index 6992c23deaa0eb2c10e677dfe2faf17c88bc2fc6..cecf77369151ef07d5f11d142a0bd6e361a74670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,20 @@ DESTDIR = $(CURDIR)/debian/tmp
 %:
 	dh $@ --builddir $(BUILDDIR)
 
+# Perform maintainer checks.
+#
+# These checks are useful for the maintainer to ensure the package
+# is always in good shape. We run them very early, both for local
+# builds and as part of Salsa CI pipelines; when building from a
+# prepared source package, however, the script will not be present
+# and so the checks will be skipped.
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+execute_before_dh_auto_configure:
+	if test -x $(CURDIR)/debian/scripts/maintainer-checks.sh; then \
+	    $(CURDIR)/debian/scripts/maintainer-checks.sh; \
+	fi
+endif
+
 # Run configure.
 #
 # We want to be explicit about the user the daemon will run as, even
diff --git a/debian/scripts/maintainer-checks.sh b/debian/scripts/maintainer-checks.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f4f02503fe0f6f080801e160c0881ff00476850d
--- /dev/null
+++ b/debian/scripts/maintainer-checks.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+out=$(wrap-and-sort -ast --dry-run)
+if test "$out"; then
+    echo "Please run 'wrap-and-sort -ast'" >&2
+    exit 1
+fi
+
+exit 0
diff --git a/debian/source/options b/debian/source/options
index 3359f9bf57f5abdf274fa81121fbead4b87139c9..6bb1e115255ea74cc07012768a09673b3492c53e 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,3 +1,4 @@
 diff-ignore = "^.*$"
 tar-ignore = "debian/gbp.conf"
 tar-ignore = "debian/salsa-ci.yml"
+tar-ignore = "debian/scripts"
diff --git a/debian/tests/control b/debian/tests/control
index b30b3c87db035f5e8fb9bcbd7eca4ea4bffb88cc..820aba318c034cc1915cf5cac4b02e9ae77c6ddb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,4 @@
 Tests: smoke
-Depends: libvirt-dbus, systemd
+Depends:
+ libvirt-dbus,
+ systemd,