diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index e16957a9d742..1bf02e0dd0cc 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/09/24 13:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2013/12/16 09:53:44 markd Exp $
 
 DISTNAME=	rpm-4.11.1
 CATEGORIES=	misc
@@ -69,6 +69,12 @@ pre-configure:
 	set -e; cd ${WRKSRC}; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
 
+SUBST_CLASSES+=		mkd
+SUBST_STAGE.mkd=	post-build
+SUBST_MESSAGE.mkd=	Fixing workdir tools references in macros file
+SUBST_FILES.mkd=	macros
+SUBST_SED.mkd+=		-e 's,${TOOLS_CMD.mkdir},${TOOLS_PATH.mkdir},'
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
diff --git a/misc/rpm/PLIST.Linux b/misc/rpm/PLIST.Linux
new file mode 100644
index 000000000000..7a45cc4df4c4
--- /dev/null
+++ b/misc/rpm/PLIST.Linux
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2013/12/16 09:53:44 markd Exp $
+lib/rpm/debugedit
+lib/rpm/elfdeps
+lib/rpm/find-debuginfo.sh
+lib/rpm/platform/aarch64-linux/macros
+lib/rpm/platform/alphaev56-linux/macros
+lib/rpm/platform/alphaev5-linux/macros
+lib/rpm/platform/alphaev67-linux/macros
+lib/rpm/platform/alphaev6-linux/macros
+lib/rpm/platform/alpha-linux/macros
+lib/rpm/platform/alphapca56-linux/macros
+lib/rpm/platform/amd64-linux/macros
+lib/rpm/platform/armv3l-linux/macros
+lib/rpm/platform/armv4b-linux/macros
+lib/rpm/platform/armv4l-linux/macros
+lib/rpm/platform/armv5tejl-linux/macros
+lib/rpm/platform/armv5tel-linux/macros
+lib/rpm/platform/armv6l-linux/macros
+lib/rpm/platform/armv7l-linux/macros
+lib/rpm/platform/athlon-linux/macros
+lib/rpm/platform/geode-linux/macros
+lib/rpm/platform/i386-linux/macros
+lib/rpm/platform/i486-linux/macros
+lib/rpm/platform/i586-linux/macros
+lib/rpm/platform/i686-linux/macros
+lib/rpm/platform/ia32e-linux/macros
+lib/rpm/platform/ia64-linux/macros
+lib/rpm/platform/noarch-linux/macros
+lib/rpm/platform/pentium3-linux/macros
+lib/rpm/platform/pentium4-linux/macros
+lib/rpm/platform/ppc32dy4-linux/macros
+lib/rpm/platform/ppc64iseries-linux/macros
+lib/rpm/platform/ppc64-linux/macros
+lib/rpm/platform/ppc64p7-linux/macros
+lib/rpm/platform/ppc64pseries-linux/macros
+lib/rpm/platform/ppc8260-linux/macros
+lib/rpm/platform/ppc8560-linux/macros
+lib/rpm/platform/ppciseries-linux/macros
+lib/rpm/platform/ppc-linux/macros
+lib/rpm/platform/ppcpseries-linux/macros
+lib/rpm/platform/s390-linux/macros
+lib/rpm/platform/s390x-linux/macros
+lib/rpm/platform/sh3-linux/macros
+lib/rpm/platform/sh4a-linux/macros
+lib/rpm/platform/sh4-linux/macros
+lib/rpm/platform/sh-linux/macros
+lib/rpm/platform/sparc64-linux/macros
+lib/rpm/platform/sparc64v-linux/macros
+lib/rpm/platform/sparc-linux/macros
+lib/rpm/platform/sparcv8-linux/macros
+lib/rpm/platform/sparcv9-linux/macros
+lib/rpm/platform/sparcv9v-linux/macros
+lib/rpm/platform/x86_64-linux/macros