diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index b26863de525b..4b2365bb1222 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -25,17 +25,16 @@ DATA_DIRS=	2YearsToNever Anonymous Aquiline BWM Big Blackwindow \
 		T-16-red T-16-yellow Titanium V absolute-metal bluefoo \
 		debian gorilla gorillaz mxflat typo
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/share/sawfish/themes
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/sawfish/themes
 .for d in ${DATA_DIRS}
 	@${TAR} --exclude ".pc" --exclude ".xvpics" -C ${WRKSRC} -cf - ${d} | \
-		${TAR} -C ${PREFIX}/share/sawfish/themes -xf -
-	@${FIND} ${PREFIX}/share/sawfish/themes/${d} | \
+		${TAR} -C ${STAGEDIR}${PREFIX}/share/sawfish/themes -xf -
+	@${FIND} ${STAGEDIR}${PREFIX}/share/sawfish/themes/${d} | \
 		${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	@${FIND} ${PREFIX}/share/sawfish/themes/${d} -type f | \
+	@${FIND} ${STAGEDIR}${PREFIX}/share/sawfish/themes/${d} -type f | \
 		${XARGS} ${CHMOD} ${SHAREMODE}
-	@${FIND} ${PREFIX}/share/sawfish/themes/${d} -type d | \
+	@${FIND} ${STAGEDIR}${PREFIX}/share/sawfish/themes/${d} -type d | \
 		${XARGS} ${CHMOD} a+rx
 .endfor
 
diff --git a/x11-themes/sawfish-themes/pkg-plist b/x11-themes/sawfish-themes/pkg-plist
index c0885b167632..f8f4f683e99c 100644
--- a/x11-themes/sawfish-themes/pkg-plist
+++ b/x11-themes/sawfish-themes/pkg-plist
@@ -1241,4 +1241,3 @@ share/sawfish/themes/typo/theme.jl
 @dirrm share/sawfish/themes/Aquiline
 @dirrm share/sawfish/themes/Anonymous
 @dirrm share/sawfish/themes/2YearsToNever
-@dirrm share/sawfish/themes