diff --git a/Makefile b/Makefile
index 9695a132..55c599e4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
 COMPILED_BINS := \
 	$(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN))
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc
+DEBS= ${PACKAGE}-server_${PKGVER}-${PKGREL}_${ARCH}.deb ${PACKAGE}-client_${PKGVER}-${PKGREL}_${ARCH}.deb
+
 
 DESTDIR=
 
@@ -64,10 +64,10 @@ build:
 	    $(MAKE) -C build/$(i) clean ;)
 
 .PHONY: deb
-deb: $(DEB)
-$(DEB): build
+deb: $(DEBS)
+$(DEBS): build
 	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
-	lintian $(DEB)
+	lintian $(DEBS)
 
 .PHONY: dsc
 dsc: $(DSC)
@@ -85,8 +85,8 @@ clean:
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB}
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}
 
 # make sure we build binaries before docs
 docs: cargo-build
diff --git a/debian/compat b/debian/compat
index f599e28b..48082f72 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/debian/control b/debian/control
index 74dbed8a..8454738b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,12 +15,20 @@ Build-Depends: bash-completion,
 Standards-Version: 3.9.5
 Homepage: https://www.proxmox.com
 
-Package: proxmox-backup
+Package: proxmox-backup-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
 	 libjs-extjs (>= 6.0.1),
 	 fonts-font-awesome,
 	 proxmox-widget-toolkit,
 	 libzstd1 (>= 1.3.8),
-Description: Proxmox Backup Server
- This is experimental code used to test Rust.
+Description: Proxmox Backup Server daemon with tools and GUI
+ This package contains the Proxmox Backup Server daemons and related
+ tools. This includes a web-based graphical user interface.
+
+Package: proxmox-backup-client
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+Description: Proxmox Backup Client tools
+ This package contains the Proxmox Backup client, which provides a
+ simple command line tool to create and restore backups.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 68b50960..00000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/proxmox-backup.service /lib/systemd/system/
-etc/proxmox-backup-proxy.service /lib/systemd/system/
diff --git a/debian/proxmox-backup-client.install b/debian/proxmox-backup-client.install
new file mode 100644
index 00000000..1ac22b56
--- /dev/null
+++ b/debian/proxmox-backup-client.install
@@ -0,0 +1,3 @@
+usr/bin/proxmox-backup-client
+usr/share/man/man1/proxmox-backup-client.1
+usr/bin/pxar
diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install
new file mode 100644
index 00000000..3c21ba5c
--- /dev/null
+++ b/debian/proxmox-backup-server.install
@@ -0,0 +1,9 @@
+etc/proxmox-backup.service /lib/systemd/system/
+etc/proxmox-backup-proxy.service /lib/systemd/system/
+usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api
+usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
+usr/share/man/man1/proxmox-backup-proxy.1
+usr/sbin/proxmox-backup-manager
+usr/share/javascript/proxmox-backup/js/proxmox-backup-gui.js
+usr/share/javascript/proxmox-backup/images/logo-128.png
+usr/share/javascript/proxmox-backup/images/proxmox_logo.png
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index e073d9e4..5f938636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,13 +6,16 @@
 export BUILD_MODE=release
 
 %:
-	dh $@ --with=systemd --with=bash-completion
+	dh $@ --with=bash-completion
 
 override_dh_auto_build:
 	dh_auto_build -- \
 	    PROXY_USER=backup \
 	    LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+override_dh_missing:
+	dh_missing --fail-missing
+
 override_dh_auto_install:
 	dh_auto_install -- \
 	    PROXY_USER=backup \