diff --git a/x11-themes/gtk-milk-theme/Makefile b/x11-themes/gtk-milk-theme/Makefile
index 406975f54ccb..0702fc98b632 100644
--- a/x11-themes/gtk-milk-theme/Makefile
+++ b/x11-themes/gtk-milk-theme/Makefile
@@ -18,7 +18,7 @@ TYPE?=		gtk
 
 THEME_NAME=	Milk
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_BUILD=	yes
 
 .if ${TYPE} == "gtk"
@@ -31,19 +31,16 @@ PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
 
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 
 do-install:
-	@${MKDIR} ${THEME_DIR}
-	${INSTALL_DATA} ${WRKSRC}/index.theme ${THEME_DIR}
+	@${MKDIR} ${STAGEDIR}${THEME_DIR}
+	${INSTALL_DATA} ${WRKSRC}/index.theme ${STAGEDIR}${THEME_DIR}
 .if ${TYPE} == "gtk"
-	cd ${WRKSRC} && ${FIND} gtk-2.0 | \
-		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} gtk-2.0 ${STAGEDIR}${THEME_DIR}
 .else
-	cd ${WRKSRC} && ${FIND} metacity-1 | \
-		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} metacity-1 ${STAGEDIR}${THEME_DIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-themes/metacity-milk-theme/Makefile b/x11-themes/metacity-milk-theme/Makefile
index 61d27ed79dee..a934802e18b8 100644
--- a/x11-themes/metacity-milk-theme/Makefile
+++ b/x11-themes/metacity-milk-theme/Makefile
@@ -4,5 +4,4 @@
 TYPE=		metacity
 MASTERDIR=	${.CURDIR}/../gtk-milk-theme
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"