diff --git a/debian/changelog b/debian/changelog
index 309cf10..cd5b597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xaw3d (1.5+F-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Debian Janitor ]
+ * Trim trailing whitespace.
+ * Update standards version to 4.6.1, no changes needed.
+
+ [ Vagrant Cascadian ]
+ * debian/rules: Pass CFLAGS with file-prefix-map in dh_auto_build.
+ (Closes: #991180)
+
+ [ Nilesh Patra ]
+ * Fix cross-building. (Closes: #986704)
+
+ -- Vagrant Cascadian <vagrant@debian.org> Thu, 29 Dec 2022 10:16:57 -0800
+
xaw3d (1.5+F-1) unstable; urgency=medium
* Reassembled original tarball to cope with dquilt.
diff --git a/debian/rules b/debian/rules
index 035721a..f366842 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,9 @@ SOURCE=xc/lib/Xaw3d
override_dh_auto_build:
rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11
cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf
- $(MAKE) -C $(SOURCE) \
- EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR"
+ dh_auto_build -- -C $(SOURCE) \
+ EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \
+ CFLAGS="-ffile-prefix-map=$(CURDIR)=. -I."
override_dh_auto_clean:
rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h
@@ -22,7 +23,7 @@ override_dh_auto_clean:
dh_clean `find . -name Makefile`
override_dh_auto_install:
- $(MAKE) -C $(SOURCE) install \
+ dh_auto_install -- -C $(SOURCE) install \
DESTDIR=$(CURDIR)/debian/tmp INCDIR=/usr/include \
SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
