diff -Nru bsdowl-2.2.2/debian/changelog bsdowl-2.2.2/debian/changelog
--- bsdowl-2.2.2/debian/changelog	2021-01-08 15:32:29.000000000 +0000
+++ bsdowl-2.2.2/debian/changelog	2021-05-04 10:33:45.000000000 +0000
@@ -1,3 +1,19 @@
+bsdowl (2.2.2-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Ansgar Burchardt ]
+  * Explicitly pass MKDIR_P, GREP and SED to configure to make build
+    reproducible between merged-usr and non-merged-usr systems.
+    (Closes: #915183)
+
+  [ Dennis Filder ]
+  * Install includes into /usr/share/bmake/mk-netbsd instead of /usr/share/mk.
+    (Closes: #980793)
+  * Use dh's bmake support.  (Closes: #982711)
+
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 04 May 2021 12:33:45 +0200
+
 bsdowl (2.2.2-1.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
diff -Nru bsdowl-2.2.2/debian/patches/bsdowl-fix-980793-piuparts.patch bsdowl-2.2.2/debian/patches/bsdowl-fix-980793-piuparts.patch
--- bsdowl-2.2.2/debian/patches/bsdowl-fix-980793-piuparts.patch	1970-01-01 00:00:00.000000000 +0000
+++ bsdowl-2.2.2/debian/patches/bsdowl-fix-980793-piuparts.patch	2021-05-04 10:24:44.000000000 +0000
@@ -0,0 +1,29 @@
+Description: Use new location of bmake include file library
+ bmake changed this in 20200710-6, but left /usr/share/mk a symlink to
+ /usr/share/bmake/mk-netbsd, thus the Build-Depends: on bmake need not
+ be changed.
+Author: Dennis Filder <d.filder@web.de>
+Bug-Debian: https://bugs.debian.org/980793
+Last-Update: 2021-02-17
+--- bsdowl-2.2.2/test/dotfile/dot.cshrc	2021-02-17 18:06:00.000000000 +0100
++++ bsdowl-2.2.2/test/dotfile/dot.cshrc	2021-02-17 18:06:00.000000000 +0100
+@@ -3,7 +3,7 @@
+ # Author: Michael Grünewald
+ # Date: Ven 26 jan 2007 19:32:47 CET
+ 
+-setenv MAKEFLAGS "-I ${HOME}/share/mk"
++setenv MAKEFLAGS "-I ${HOME}/share/bmake/mk-netbsd"
+ #setenv TEXMFCNF "${HOME}/share/texmf/web2c"
+ set nethack_name=Malchance
+ set nethack_pickup='$'
+--- bsdowl-2.2.2/Library/Make/project.mk	2021-02-17 18:06:00.000000000 +0100
++++ bsdowl-2.2.2/Library/Make/project.mk	2021-02-17 18:06:00.000000000 +0100
+@@ -18,7 +18,7 @@
+ PACKAGE = bps
+ SCRIPTDIR = ${_BPS_LIBEXEC}
+ SHAREDIR = ${_BPS_DATADIR}
+-FILESDIR = ${_BPS_PREFIX}/share/mk
++FILESDIR = ${_BPS_PREFIX}/share/bmake/mk-netbsd
+ 
+ .include "../../bps/bps.init.mk"
+ .include "../../texmf/tex.files.mk"
diff -Nru bsdowl-2.2.2/debian/patches/series bsdowl-2.2.2/debian/patches/series
--- bsdowl-2.2.2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ bsdowl-2.2.2/debian/patches/series	2021-05-04 10:25:01.000000000 +0000
@@ -0,0 +1 @@
+bsdowl-fix-980793-piuparts.patch
diff -Nru bsdowl-2.2.2/debian/rules bsdowl-2.2.2/debian/rules
--- bsdowl-2.2.2/debian/rules	2014-11-29 12:00:29.000000000 +0000
+++ bsdowl-2.2.2/debian/rules	2021-05-04 10:19:59.000000000 +0000
@@ -1,18 +1,11 @@
 #!/usr/bin/make -f
-MAKETOOL=bmake -r DESTDIR=$$(pwd)/debian/bsdowl
 
 %:
-	dh $@
+	dh $@ -O--buildsystem=bmake
 
-override_dh_auto_build:
-	${MAKETOOL} build
-
-override_dh_auto_install:
-	${MAKETOOL} install
-	dh_installman
-
-override_dh_auto_clean:
-	${MAKETOOL} distclean
-
-override_dh_auto_test:
-	: Do nada
+# debhelper's bmake.pm no longer inherits from autoconf, so for
+# auto_configure we have to pretend to use autoconf.
+# If you fix any problems here please tell the udfclient maintainer
+# since that uses bmake+autoconf, too.
+override_dh_auto_configure:
+	dh_auto_configure -O--buildsystem=autoconf -- MKDIR_P="/bin/mkdir -p" GREP=/bin/grep SED=/bin/sed