diff --git a/configure.ac b/configure.ac
index cf36ea2..82e232b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,7 @@
 dnl DIRECT_CONFIG=$(DIRECT_ETC)/.config
 
 # Other paths
-AC_PATH_PROGS(NC,nc netcat,/usr/bin/nc,$BSB)
+AC_PATH_PROGS(NC,nc netcat,/bin/nc,$BSB)
 AC_PATH_PROGS(RLPR,rlpr,/usr/bin/rlpr,$BSB)
 AC_PATH_PROGS(SMBCLIENT,smbclient,/usr/bin/smbclient,$BSB)
 AC_PATH_PROGS(NPRINT,nprint,/usr/bin/nprint,$BSB)
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..543c995
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+c6f09a481511c28c22c02aae81f45d24fdaa5fc6
+c6f09a481511c28c22c02aae81f45d24fdaa5fc6
+9cd19fc3e30a3f2036c5120f3aca581150069e46
+9cd19fc3e30a3f2036c5120f3aca581150069e46
+foomatic-db-engine_4.0.12.orig.tar.gz
+c3b747113b6a64b998000774e7c2d03ce48654c1
+360499
diff --git a/debian/patches/0001-Fix-netcat-s-path-in-Debian-it-lives-in-bin.patch b/debian/patches/0001-Fix-netcat-s-path-in-Debian-it-lives-in-bin.patch
new file mode 100644
index 0000000..c870c6a
--- /dev/null
+++ b/debian/patches/0001-Fix-netcat-s-path-in-Debian-it-lives-in-bin.patch
@@ -0,0 +1,24 @@
+From 74a40aa9aac7897d62e117cc82fb4c5eb2a5bf30 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 10 Feb 2018 14:48:02 +0100
+Subject: Fix netcat's path; in Debian it lives in /bin.
+
+Bug-Debian: http://bugs.debian.org/676378
+Last-Update: 2012-06-11
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cf36ea2..82e232b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,7 +277,7 @@ dnl DIRECT_ETC=/etc/foomatic/direct
+ dnl DIRECT_CONFIG=$(DIRECT_ETC)/.config
+ 
+ # Other paths
+-AC_PATH_PROGS(NC,nc netcat,/usr/bin/nc,$BSB)
++AC_PATH_PROGS(NC,nc netcat,/bin/nc,$BSB)
+ AC_PATH_PROGS(RLPR,rlpr,/usr/bin/rlpr,$BSB)
+ AC_PATH_PROGS(SMBCLIENT,smbclient,/usr/bin/smbclient,$BSB)
+ AC_PATH_PROGS(NPRINT,nprint,/usr/bin/nprint,$BSB)
diff --git a/debian/patches/0002-Justify-long-lines-to-avoid-man-warnings.patch b/debian/patches/0002-Justify-long-lines-to-avoid-man-warnings.patch
new file mode 100644
index 0000000..a4dd2b4
--- /dev/null
+++ b/debian/patches/0002-Justify-long-lines-to-avoid-man-warnings.patch
@@ -0,0 +1,39 @@
+From c6f09a481511c28c22c02aae81f45d24fdaa5fc6 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 10 Feb 2018 14:48:03 +0100
+Subject: Justify long lines to avoid man warnings
+
+Last-Update: 2014-04-06
+---
+ foomatic-configure.1.in | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/foomatic-configure.1.in b/foomatic-configure.1.in
+index 6584ec2..5671838 100644
+--- a/foomatic-configure.1.in
++++ b/foomatic-configure.1.in
+@@ -8,7 +8,12 @@ printing system.
+ .B foomatic-configure
+ [\fIOPTION\fR]...
+ 
+-.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ] \ [\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ] \ [\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ] \ \fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB] \ \fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB \ \fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
++.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ]
++[\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ]
++[\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ]
++\fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB]
++\fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB
++\fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
+ 
+ .BI foomatic-configure\ \-D\ \-n \ queuename \ [\ \-s \ spooler \ ]\ [\ \-q\ ]
+ 
+@@ -16,7 +21,9 @@ printing system.
+ 
+ .BI foomatic-configure\ \-Q\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]\ [\ \-r\ ]
+ 
+-.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ] \ \fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB] \ \fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
++.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]
++\fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB]
++\fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
+ 
+ .BI foomatic-configure\ \-X\ \-p \ printer \ |\ \-d \ driver \ |
+ .BI \-p \ printer \ \-d \ driver
diff --git a/debian/patches/fix_manpage.patch b/debian/patches/fix_manpage.patch
deleted file mode 100644
index 4909558..0000000
--- a/debian/patches/fix_manpage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Justify long lines to avoid man warnings
-Author: Didier Raboud <odyx@debian.org>
-Last-Update: 2014-04-06
---- a/foomatic-configure.1.in
-+++ b/foomatic-configure.1.in
-@@ -8,7 +8,12 @@
- .B foomatic-configure
- [\fIOPTION\fR]...
- 
--.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ] \ [\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ] \ [\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ] \ \fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB] \ \fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB \ \fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
-+.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ]
-+[\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ]
-+[\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ]
-+\fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB]
-+\fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB
-+\fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
- 
- .BI foomatic-configure\ \-D\ \-n \ queuename \ [\ \-s \ spooler \ ]\ [\ \-q\ ]
- 
-@@ -16,7 +21,9 @@
- 
- .BI foomatic-configure\ \-Q\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]\ [\ \-r\ ]
- 
--.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ] \ \fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB] \ \fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
-+.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]
-+\fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB]
-+\fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
- 
- .BI foomatic-configure\ \-X\ \-p \ printer \ |\ \-d \ driver \ |
- .BI \-p \ printer \ \-d \ driver
diff --git a/debian/patches/fix_nc_path.patch b/debian/patches/fix_nc_path.patch
deleted file mode 100644
index 33566c5..0000000
--- a/debian/patches/fix_nc_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix netcat's path; in Debian it lives in /bin.
-Author: Didier Raboud <odyx@debian.org>
-Bug-Debian: http://bugs.debian.org/676378
-Last-Update: 2012-06-11
---- a/configure.ac
-+++ b/configure.ac
-@@ -277,7 +277,7 @@
- dnl DIRECT_CONFIG=$(DIRECT_ETC)/.config
- 
- # Other paths
--AC_PATH_PROGS(NC,nc netcat,/usr/bin/nc,$BSB)
-+AC_PATH_PROGS(NC,nc netcat,/bin/nc,$BSB)
- AC_PATH_PROGS(RLPR,rlpr,/usr/bin/rlpr,$BSB)
- AC_PATH_PROGS(SMBCLIENT,smbclient,/usr/bin/smbclient,$BSB)
- AC_PATH_PROGS(NPRINT,nprint,/usr/bin/nprint,$BSB)
diff --git a/debian/patches/series b/debian/patches/series
index d6f6e9e..7a6ef2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix_nc_path.patch
-fix_manpage.patch
+0001-Fix-netcat-s-path-in-Debian-it-lives-in-bin.patch
+0002-Justify-long-lines-to-avoid-man-warnings.patch
diff --git a/foomatic-configure.1.in b/foomatic-configure.1.in
index 6584ec2..5671838 100644
--- a/foomatic-configure.1.in
+++ b/foomatic-configure.1.in
@@ -8,7 +8,12 @@
 .B foomatic-configure
 [\fIOPTION\fR]...
 
-.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ] \ [\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ] \ [\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ] \ \fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB] \ \fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB \ \fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
+.BI foomatic-configure\ \-n \ queuename \ [\ \-N \ description \ ]
+[\ \-L \ location \ ] \ [\ \-c \ connect \ ] \ [\ \-d \ driver \ ]
+[\ \-p \ printer \ ] \ [\ \--ppd \ ppdfile \ ] \ [\ \-s \ spooler \ ]
+\fB[\ \fB\-C \ \fB[\ \fIsourcespooler\fB\ \fB]\ \fIsourcequeue\fB \ \fB]
+\fB[\ \fB\-o \ \fIoption1\fB=\fIvalue1\fB \ \fB\-o \ \fIoption2\fB
+\fB...\ \fB]\ \fB[\ \fB\-q\ \fB]\
 
 .BI foomatic-configure\ \-D\ \-n \ queuename \ [\ \-s \ spooler \ ]\ [\ \-q\ ]
 
@@ -16,7 +21,9 @@
 
 .BI foomatic-configure\ \-Q\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]\ [\ \-r\ ]
 
-.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ] \ \fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB] \ \fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
+.BI foomatic-configure\ \-P\ \ [\ \-s \ spooler \ ]\ [\ \-n \ queuename \ ]
+\fB[\ \fB\-d \ \fIdriver \ \fB] \ \fB[\ \fB\-p \ \fIprinter \ \fB]
+\fB[\ \fB\--ppd \ \fIppdfile \ \fB] \ \fB[\ \fIindex \ \fB]
 
 .BI foomatic-configure\ \-X\ \-p \ printer \ |\ \-d \ driver \ |
 .BI \-p \ printer \ \-d \ driver