diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 6136dab676aa..4bb4e9bec1e0 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -5,15 +5,15 @@ PORTNAME=	rocksndiamonds
 PORTVERSION=	3.3.0.1
 PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
-		http://www.jb-line.de/rnd/ \
-		SF/${PORTNAME}.mirror/ \
+MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \
+		SF/${PORTNAME}.mirror/:game \
+		http://www.jb-line.de/rnd/:rnd \
 		http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels \
 		http://www.bd-fans.com/Files/RnD/Levels/ \
 		SF/nemysisfreebsdp/${PORTNAME}/:icons
 # Please contact the MAINTAINER if a Level is missing
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		rnd_jue-3.3.0.0.tar.gz \
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \
+		rnd_jue-3.3.0.0.tar.gz:rnd \
 		Sokoban-1.0.0.zip:levels \
 		Contributions-1.2.0.zip:levels \
 		${LEVELS_BD_FANS:S/$/.zip/} \
diff --git a/games/rocksndiamonds/pkg-plist b/games/rocksndiamonds/pkg-plist
index 3bb4e0df0e4b..7ec00e69958f 100644
--- a/games/rocksndiamonds/pkg-plist
+++ b/games/rocksndiamonds/pkg-plist
@@ -541,15 +541,3 @@ share/pixmaps/rocksndiamonds.png
 @dirrm %%DATADIR%%/levels/Classic_Games
 @dirrm %%DATADIR%%/graphics/gfx_classic
 @dirrm %%DATADIR%%/graphics
-@dirrmtry share/icons/hicolor/96x96/apps
-@dirrmtry share/icons/hicolor/96x96
-@dirrmtry share/icons/hicolor/72x72/apps
-@dirrmtry share/icons/hicolor/72x72
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons