diff --git a/.drone.yml b/.drone.yml
index 323808b..eaf4170 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,7 +16,7 @@ steps:
       - dpkg-buildpackage -b -uc
       - rename 's/\.deb/_bullseye\.deb/' ../*.deb
       - mkdir -p /deb_files/bullseye/
-      - cp ../nut*.deb /deb_files/bullseye/
+      - cp ../*.deb /deb_files/bullseye/
       - find /deb_files/
   
   - name: gitea_release
diff --git a/debian/changelog b/debian/changelog
index f14aa2e..46485d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ nut (2.8.0-1) unstable; urgency=medium
   [ lagertonne ]
   * new upstream 2.8.0
 
- -- Jan-Tristan Kruse <mail@lagertonne.de>  wed, 29 Jun 2022 12:39:00 +0100
+ -- lagertonne <mail@lagertonne.de>  Wed, 29 Jun 2022 13:12:45 +0000
 
 nut (2.7.4-14) unstable; urgency=medium
 
diff --git a/debian/libnutclient-dev.manpages b/debian/libnutclient-dev.manpages
deleted file mode 100644
index ced03c7..0000000
--- a/debian/libnutclient-dev.manpages
+++ /dev/null
@@ -1,34 +0,0 @@
-debian/tmp/usr/share/man/man3/libnutclient.3
-debian/tmp/usr/share/man/man3/libnutclient_commands.3
-debian/tmp/usr/share/man/man3/libnutclient_devices.3
-debian/tmp/usr/share/man/man3/libnutclient_general.3
-debian/tmp/usr/share/man/man3/libnutclient_misc.3
-debian/tmp/usr/share/man/man3/libnutclient_tcp.3
-debian/tmp/usr/share/man/man3/libnutclient_variables.3
-debian/tmp/usr/share/man/man3/nutclient_authenticate.3
-debian/tmp/usr/share/man/man3/nutclient_destroy.3
-debian/tmp/usr/share/man/man3/nutclient_device_forced_shutdown.3
-debian/tmp/usr/share/man/man3/nutclient_device_login.3
-debian/tmp/usr/share/man/man3/nutclient_device_master.3
-debian/tmp/usr/share/man/man3/nutclient_execute_device_command.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_command_description.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_commands.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_description.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_num_logins.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_rw_variables.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_variable_description.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_variable_values.3
-debian/tmp/usr/share/man/man3/nutclient_get_device_variables.3
-debian/tmp/usr/share/man/man3/nutclient_get_devices.3
-debian/tmp/usr/share/man/man3/nutclient_has_device.3
-debian/tmp/usr/share/man/man3/nutclient_has_device_command.3
-debian/tmp/usr/share/man/man3/nutclient_has_device_variable.3
-debian/tmp/usr/share/man/man3/nutclient_logout.3
-debian/tmp/usr/share/man/man3/nutclient_set_device_variable_value.3
-debian/tmp/usr/share/man/man3/nutclient_set_device_variable_values.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_create_client.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_disconnect.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_get_timeout.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_is_connected.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_reconnect.3
-debian/tmp/usr/share/man/man3/nutclient_tcp_set_timeout.3
diff --git a/debian/libnutscan-dev.manpages b/debian/libnutscan-dev.manpages
deleted file mode 100644
index c2b22c5..0000000
--- a/debian/libnutscan-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man3/nutscan*.3
diff --git a/debian/libupsclient-dev.manpages b/debian/libupsclient-dev.manpages
deleted file mode 100644
index 5c01cdd..0000000
--- a/debian/libupsclient-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man3/upscli*.3
diff --git a/debian/nut-cgi.manpages b/debian/nut-cgi.manpages
deleted file mode 100644
index 36a1449..0000000
--- a/debian/nut-cgi.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/usr/share/man/man5/hosts.conf.5
-debian/tmp/usr/share/man/man5/upsset.conf.5
-debian/tmp/usr/share/man/man5/upsstats.html.5
-debian/tmp/usr/share/man/man8/upsimage.cgi.8
-debian/tmp/usr/share/man/man8/upsset.cgi.8
-debian/tmp/usr/share/man/man8/upsstats.cgi.8
diff --git a/debian/nut-client.manpages b/debian/nut-client.manpages
deleted file mode 100644
index 9a02533..0000000
--- a/debian/nut-client.manpages
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/usr/share/man/man5/nut.conf.5
-debian/tmp/usr/share/man/man5/upsmon.conf.5
-debian/tmp/usr/share/man/man5/upssched.conf.5
-debian/tmp/usr/share/man/man8/upsc.8
-debian/tmp/usr/share/man/man8/upscmd.8
-debian/tmp/usr/share/man/man8/upslog.8
-debian/tmp/usr/share/man/man8/upsmon.8
-debian/tmp/usr/share/man/man8/upsrw.8
-debian/tmp/usr/share/man/man8/upssched.8
diff --git a/debian/nut-ipmi.manpages b/debian/nut-ipmi.manpages
deleted file mode 100644
index 5da576f..0000000
--- a/debian/nut-ipmi.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man8/nut-ipmipsu.8
diff --git a/debian/nut-powerman-pdu.manpages b/debian/nut-powerman-pdu.manpages
deleted file mode 100644
index 43bbc81..0000000
--- a/debian/nut-powerman-pdu.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man8/powerman-pdu.8
diff --git a/debian/nut-server.install b/debian/nut-server.install
index 7247dba..51591c7 100644
--- a/debian/nut-server.install
+++ b/debian/nut-server.install
@@ -36,7 +36,6 @@ debian/tmp/lib/nut/mge-utalk
 debian/tmp/lib/nut/microdowell
 debian/tmp/lib/nut/nutdrv_atcl_usb
 debian/tmp/lib/nut/nutdrv_qx
-debian/tmp/lib/nut/oldmge-shut
 debian/tmp/lib/nut/oneac
 debian/tmp/lib/nut/optiups
 debian/tmp/lib/nut/powercom
@@ -55,7 +54,10 @@ debian/tmp/lib/nut/upsd
 debian/tmp/lib/nut/usbhid-ups
 debian/tmp/lib/nut/victronups
 debian/tmp/lib/systemd/system-shutdown/nutshutdown
-debian/tmp/lib/systemd/system/nut-driver.service
+debian/tmp/lib/systemd/system/nut-driver\@.service
+debian/tmp/lib/systemd/system/nut-driver.target
+debian/tmp/lib/systemd/system/nut-driver-enumerator.service
+debian/tmp/lib/systemd/system/nut-driver-enumerator.path
 debian/tmp/lib/systemd/system/nut-server.service
 debian/tmp/sbin/upsd
 debian/tmp/sbin/upsdrvctl
diff --git a/debian/nut-server.manpages b/debian/nut-server.manpages
deleted file mode 100644
index 63939cd..0000000
--- a/debian/nut-server.manpages
+++ /dev/null
@@ -1,54 +0,0 @@
-debian/tmp/usr/share/man/man5/ups.conf.5
-debian/tmp/usr/share/man/man5/upsd.conf.5
-debian/tmp/usr/share/man/man5/upsd.users.5
-debian/tmp/usr/share/man/man8/al175.8
-debian/tmp/usr/share/man/man8/apcsmart-old.8
-debian/tmp/usr/share/man/man8/apcsmart.8
-debian/tmp/usr/share/man/man8/apcupsd-ups.8
-debian/tmp/usr/share/man/man8/bcmxcp.8
-debian/tmp/usr/share/man/man8/bcmxcp_usb.8
-debian/tmp/usr/share/man/man8/belkin.8
-debian/tmp/usr/share/man/man8/belkinunv.8
-debian/tmp/usr/share/man/man8/bestfcom.8
-debian/tmp/usr/share/man/man8/bestfortress.8
-debian/tmp/usr/share/man/man8/bestuferrups.8
-debian/tmp/usr/share/man/man8/bestups.8
-debian/tmp/usr/share/man/man8/blazer_ser.8
-debian/tmp/usr/share/man/man8/blazer_usb.8
-debian/tmp/usr/share/man/man8/clone.8
-debian/tmp/usr/share/man/man8/dummy-ups.8
-debian/tmp/usr/share/man/man8/etapro.8
-debian/tmp/usr/share/man/man8/everups.8
-debian/tmp/usr/share/man/man8/gamatronic.8
-debian/tmp/usr/share/man/man8/genericups.8
-debian/tmp/usr/share/man/man8/isbmex.8
-debian/tmp/usr/share/man/man8/ivtscd.8
-debian/tmp/usr/share/man/man8/liebert-esp2.8
-debian/tmp/usr/share/man/man8/liebert.8
-debian/tmp/usr/share/man/man8/masterguard.8
-debian/tmp/usr/share/man/man8/metasys.8
-debian/tmp/usr/share/man/man8/mge-shut.8
-debian/tmp/usr/share/man/man8/mge-utalk.8
-debian/tmp/usr/share/man/man8/microdowell.8
-debian/tmp/usr/share/man/man8/nut-scanner.8
-debian/tmp/usr/share/man/man8/nutdrv_atcl_usb.8
-debian/tmp/usr/share/man/man8/nutdrv_qx.8
-debian/tmp/usr/share/man/man8/nutupsdrv.8
-debian/tmp/usr/share/man/man8/oneac.8
-debian/tmp/usr/share/man/man8/optiups.8
-debian/tmp/usr/share/man/man8/powercom.8
-debian/tmp/usr/share/man/man8/powerpanel.8
-debian/tmp/usr/share/man/man8/rhino.8
-debian/tmp/usr/share/man/man8/richcomm_usb.8
-debian/tmp/usr/share/man/man8/riello_ser.8
-debian/tmp/usr/share/man/man8/riello_usb.8
-debian/tmp/usr/share/man/man8/safenet.8
-debian/tmp/usr/share/man/man8/solis.8
-debian/tmp/usr/share/man/man8/tripplite.8
-debian/tmp/usr/share/man/man8/tripplite_usb.8
-debian/tmp/usr/share/man/man8/tripplitesu.8
-debian/tmp/usr/share/man/man8/upscode2.8
-debian/tmp/usr/share/man/man8/upsd.8
-debian/tmp/usr/share/man/man8/upsdrvctl.8
-debian/tmp/usr/share/man/man8/usbhid-ups.8
-debian/tmp/usr/share/man/man8/victronups.8
diff --git a/debian/nut-snmp.manpages b/debian/nut-snmp.manpages
deleted file mode 100644
index 3c9644e..0000000
--- a/debian/nut-snmp.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man8/snmp-ups.8
diff --git a/debian/nut-xml.manpages b/debian/nut-xml.manpages
deleted file mode 100644
index 91a537e..0000000
--- a/debian/nut-xml.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man8/netxml-ups.8
diff --git a/debian/rules b/debian/rules
index 7f77ca1..9a3f689 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/pdf
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/html
 	cp $(CURDIR)/docs/*.pdf $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/pdf
-	cp $(CURDIR)/docs/FAQ.html $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/html
+	cp $(CURDIR)/docs/FAQ.txt $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/html
 
 	for f in $(CURDIR)/docs/*.chunked/; do \
 		nf=`basename $${f} | sed 's/\(.*\)\.chunked/\1/'`; \