diff --git a/x11/gtk2-murrine-engine/Makefile b/x11/gtk2-murrine-engine/Makefile
index 1dace68a64f..af033267660 100644
--- a/x11/gtk2-murrine-engine/Makefile
+++ b/x11/gtk2-murrine-engine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/06/25 08:19:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2007/06/26 09:35:15 sturm Exp $
 
 SHARED_ONLY=	Yes
 
@@ -20,9 +20,15 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/
-DISTFILES=	murrine/${DISTNAME}.tar.bz2 \
+MASTER_SITES0=	http://cimi.netsons.org/media/download_gallery/murrine/
+DIST_SUBDIR=	${DISTNAME}
+DISTFILES=	${DISTNAME}.tar.bz2:0 \
 		MurrineThemePack.tar.bz2 \
-		Murrina{FancyCandy,VerdeOlivo,AquaIsh,Gilouche,LoveGray}.tar.bz2
+		MurrinaFancyCandy.tar.bz2 \
+		MurrinaVerdeOlivo.tar.bz2 \
+		MurrinaAquaIsh.tar.bz2 \
+		MurrinaGilouche.tar.bz2 \
+		MurrinaLoveGray.tar.bz2
 
 WANTLIB=	X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
 		Xrender cairo expat fontconfig freetype glitz m png z \
diff --git a/x11/gtk2-murrine-engine/distinfo b/x11/gtk2-murrine-engine/distinfo
index 6fe09aeea33..e9eee595b83 100644
--- a/x11/gtk2-murrine-engine/distinfo
+++ b/x11/gtk2-murrine-engine/distinfo
@@ -1,35 +1,35 @@
-MD5 (MurrinaAquaIsh.tar.bz2) = 4YuxkXVu0beTQy9rx2B9tA==
-MD5 (MurrinaFancyCandy.tar.bz2) = Wmbz3kFUegon+SWsjY2MRg==
-MD5 (MurrinaGilouche.tar.bz2) = Zdjx8o+cjtFLFeyJTdC/wA==
-MD5 (MurrinaLoveGray.tar.bz2) = Mc6fzlEUwc/kcdxhTeU5zA==
-MD5 (MurrinaVerdeOlivo.tar.bz2) = f7VdYTwxoUVanbbBIf/wuw==
-MD5 (MurrineThemePack.tar.bz2) = QUATwi0fs5VKXD0JSZyAsg==
-MD5 (murrine/murrine-0.53.1.tar.bz2) = CfAUWErlk7l5Xz9tsmAF2A==
-RMD160 (MurrinaAquaIsh.tar.bz2) = u/adMGH7EbhirM94fjI93MOU1co=
-RMD160 (MurrinaFancyCandy.tar.bz2) = fSn2dPXvbyjhnRRV2keOEH2jA3Y=
-RMD160 (MurrinaGilouche.tar.bz2) = VNv8gfq6Qyu/BdgnNWmFM8bSM+k=
-RMD160 (MurrinaLoveGray.tar.bz2) = FeiwDI3M7uWpHzw/biFiuo1dZNE=
-RMD160 (MurrinaVerdeOlivo.tar.bz2) = uUNdA0XIttZMmvfqpR7sTg3l0o8=
-RMD160 (MurrineThemePack.tar.bz2) = ecz8br8c9FpalyG0EcOdZLBlf64=
-RMD160 (murrine/murrine-0.53.1.tar.bz2) = 3XpQfufOMjuIOCz0K6t/AYgfnDk=
-SHA1 (MurrinaAquaIsh.tar.bz2) = v6YJlBO33hxzS5hdQHE7mX33Bgs=
-SHA1 (MurrinaFancyCandy.tar.bz2) = a5V83BnBE/pgirg7aQ1yt34MEDM=
-SHA1 (MurrinaGilouche.tar.bz2) = C0cXUiqRFRHy915ZnakpKXrP4XQ=
-SHA1 (MurrinaLoveGray.tar.bz2) = mbnQFzhPlNFg3WmprlqgYdHF7KM=
-SHA1 (MurrinaVerdeOlivo.tar.bz2) = JhYAJzZgc9bXePuc++a+9NgQm08=
-SHA1 (MurrineThemePack.tar.bz2) = Z0cuwvmZzl5x27whzb4+INWl3sw=
-SHA1 (murrine/murrine-0.53.1.tar.bz2) = EI4vpDwVJAb/DHvNr0hEE/171zU=
-SHA256 (MurrinaAquaIsh.tar.bz2) = bYRkmt9C7/kPPktUtdQKipCqayRwt20vcs/YcJSWFH4=
-SHA256 (MurrinaFancyCandy.tar.bz2) = kW/XRECriteH3gXsw7Hcr7bFdrfa8hEAgjbCIqc5oGs=
-SHA256 (MurrinaGilouche.tar.bz2) = WJUWwOqBYo0DF2UNY2eiLdDeremBoEKkYs721P8aJZI=
-SHA256 (MurrinaLoveGray.tar.bz2) = xfnrBSoS7vkOcljKXPXKJ9ELMzoaN1Pe8YP1PAltRWs=
-SHA256 (MurrinaVerdeOlivo.tar.bz2) = 4LKgDE6os1qlfhp5VMyUU4t4KaYqO5uNyl57G817eZA=
-SHA256 (MurrineThemePack.tar.bz2) = HD2qh/xV5B+GpTqtNgXvKJTO1k7Jajv/iIgPye9YyWo=
-SHA256 (murrine/murrine-0.53.1.tar.bz2) = ihwJk9Llf99kOpxKdUlK/suQDQcOkB//YA2/vyQfMEI=
-SIZE (MurrinaAquaIsh.tar.bz2) = 1353
-SIZE (MurrinaFancyCandy.tar.bz2) = 1586
-SIZE (MurrinaGilouche.tar.bz2) = 2062
-SIZE (MurrinaLoveGray.tar.bz2) = 1510
-SIZE (MurrinaVerdeOlivo.tar.bz2) = 1320
-SIZE (MurrineThemePack.tar.bz2) = 3003
-SIZE (murrine/murrine-0.53.1.tar.bz2) = 261530
+MD5 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = 4YuxkXVu0beTQy9rx2B9tA==
+MD5 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = Wmbz3kFUegon+SWsjY2MRg==
+MD5 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = Zdjx8o+cjtFLFeyJTdC/wA==
+MD5 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = Mc6fzlEUwc/kcdxhTeU5zA==
+MD5 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = f7VdYTwxoUVanbbBIf/wuw==
+MD5 (murrine-0.53.1/MurrineThemePack.tar.bz2) = QUATwi0fs5VKXD0JSZyAsg==
+MD5 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = CfAUWErlk7l5Xz9tsmAF2A==
+RMD160 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = u/adMGH7EbhirM94fjI93MOU1co=
+RMD160 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = fSn2dPXvbyjhnRRV2keOEH2jA3Y=
+RMD160 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = VNv8gfq6Qyu/BdgnNWmFM8bSM+k=
+RMD160 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = FeiwDI3M7uWpHzw/biFiuo1dZNE=
+RMD160 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = uUNdA0XIttZMmvfqpR7sTg3l0o8=
+RMD160 (murrine-0.53.1/MurrineThemePack.tar.bz2) = ecz8br8c9FpalyG0EcOdZLBlf64=
+RMD160 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = 3XpQfufOMjuIOCz0K6t/AYgfnDk=
+SHA1 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = v6YJlBO33hxzS5hdQHE7mX33Bgs=
+SHA1 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = a5V83BnBE/pgirg7aQ1yt34MEDM=
+SHA1 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = C0cXUiqRFRHy915ZnakpKXrP4XQ=
+SHA1 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = mbnQFzhPlNFg3WmprlqgYdHF7KM=
+SHA1 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = JhYAJzZgc9bXePuc++a+9NgQm08=
+SHA1 (murrine-0.53.1/MurrineThemePack.tar.bz2) = Z0cuwvmZzl5x27whzb4+INWl3sw=
+SHA1 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = EI4vpDwVJAb/DHvNr0hEE/171zU=
+SHA256 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = bYRkmt9C7/kPPktUtdQKipCqayRwt20vcs/YcJSWFH4=
+SHA256 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = kW/XRECriteH3gXsw7Hcr7bFdrfa8hEAgjbCIqc5oGs=
+SHA256 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = WJUWwOqBYo0DF2UNY2eiLdDeremBoEKkYs721P8aJZI=
+SHA256 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = xfnrBSoS7vkOcljKXPXKJ9ELMzoaN1Pe8YP1PAltRWs=
+SHA256 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = 4LKgDE6os1qlfhp5VMyUU4t4KaYqO5uNyl57G817eZA=
+SHA256 (murrine-0.53.1/MurrineThemePack.tar.bz2) = HD2qh/xV5B+GpTqtNgXvKJTO1k7Jajv/iIgPye9YyWo=
+SHA256 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = ihwJk9Llf99kOpxKdUlK/suQDQcOkB//YA2/vyQfMEI=
+SIZE (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = 1353
+SIZE (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = 1586
+SIZE (murrine-0.53.1/MurrinaGilouche.tar.bz2) = 2062
+SIZE (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = 1510
+SIZE (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = 1320
+SIZE (murrine-0.53.1/MurrineThemePack.tar.bz2) = 3003
+SIZE (murrine-0.53.1/murrine-0.53.1.tar.bz2) = 261530