diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-f7/Makefile
+++ b/emulators/linux_base-f7/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-fc3/Makefile b/emulators/linux_base-fc3/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-fc3/Makefile
+++ b/emulators/linux_base-fc3/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-fc6/Makefile
+++ b/emulators/linux_base-fc6/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
 
diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile
index 965525c8abab..4bc5dad66da3 100644
--- a/emulators/linux_base-fc7/Makefile
+++ b/emulators/linux_base-fc7/Makefile
@@ -105,7 +105,8 @@ RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
 
 EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
-EXTRACT_CMD?=			${RPM2CPIO}
+EXTRACT_ONLY=		${BIN_DISTFILES}
+EXTRACT_CMD?=		${RPM2CPIO}
 EXTRACT_BEFORE_ARGS?=
 EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet