diff --git a/debian/changelog b/debian/changelog
index 66f14d2..e844043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 nut (2.7.4-9) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * d/changelog: Remove trailing whitespaces
   * d/control: Remove XS-Testsuite field, not needed anymore
 
- -- Ondřej Nový <onovy@debian.org>  Mon, 01 Oct 2018 09:45:36 +0200
+  [ Arnaud Quette ]
+  * debian/control, debian/rules, debian/libnutscan1.install,
+    debian/libnutscan-dev.install: distribute nut-scanner. (Closes: #921379)
+
+ -- Arnaud Quette <aquette@debian.org>  Tue, 26 Feb 2019 13:34:07 +0100
 
 nut (2.7.4-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index a2b5199..2b8821e 100644
--- a/debian/control
+++ b/debian/control
@@ -233,6 +233,34 @@ Description: network UPS tools - development files
  .
  This package provides the development files for the new client library.
 
+Package: libnutscan1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: network UPS tools - scanner library
+ Network UPS Tools (NUT) is a client/server monitoring system that
+ allows computers to share uninterruptible power supply (UPS) and
+ power distribution unit (PDU) hardware. Clients access the hardware
+ through the server, and are notified whenever the power status
+ changes.
+ .
+ This package provides the shared client library.
+
+Package: libnutscan-dev
+Section: libdevel
+Architecture: any
+Depends: libnutscan1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: network UPS tools - development files
+ Network UPS Tools (NUT) is a client/server monitoring system that
+ allows computers to share uninterruptible power supply (UPS) and
+ power distribution unit (PDU) hardware. Clients access the hardware
+ through the server, and are notified whenever the power status
+ changes.
+ .
+ This package provides the development files.
+
 Package: python-nut
 Section: python
 Architecture: all
diff --git a/debian/libnutscan-dev.install b/debian/libnutscan-dev.install
new file mode 100644
index 0000000..7ec9050
--- /dev/null
+++ b/debian/libnutscan-dev.install
@@ -0,0 +1,6 @@
+usr/lib/*/libnutscan.so
+usr/lib/*/pkgconfig/libnutscan.pc
+usr/include/nut-scan.h
+usr/include/nutscan-ip.h
+usr/include/nutscan-device.h
+usr/include/nutscan-init.h
diff --git a/debian/libnutscan1.install b/debian/libnutscan1.install
new file mode 100644
index 0000000..2616b8d
--- /dev/null
+++ b/debian/libnutscan1.install
@@ -0,0 +1 @@
+lib/*/libnutscan.so.*
diff --git a/debian/nut-server.install b/debian/nut-server.install
index 20a3a6f..3bb6df6 100644
--- a/debian/nut-server.install
+++ b/debian/nut-server.install
@@ -57,3 +57,4 @@ debian/tmp/sbin/upsd
 debian/tmp/sbin/upsdrvctl
 debian/tmp/usr/share/nut/cmdvartab
 debian/tmp/usr/share/nut/driver.list
+debian/tmp/bin/nut-scanner
diff --git a/debian/rules b/debian/rules
index e0ff24a..4da65a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,10 @@ common-install-arch::
 	ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutclient.so.0 \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutclient.so
 
+	rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutscan.so
+	ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutscan.so.1 \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutscan.so
+
 	# Move daemons and install wrappers
 	mv $(CURDIR)/debian/tmp/sbin/upsmon $(CURDIR)/debian/tmp/lib/nut/upsmon
 	mv $(CURDIR)/debian/tmp/sbin/upsd $(CURDIR)/debian/tmp/lib/nut/upsd