--- branches/magellan-next/include/xfce.sminc	2010/09/14 16:46:32	6654
+++ branches/magellan-next/include/xfce.sminc	2011/09/29 19:12:39	9012
@@ -13,10 +13,17 @@
 
 sminclude mtools
 
+case ${PNAME} in
+	thunar-*-plugin)	URISUBDIR="thunar-plugins" ;;
+	xfce4-*-plugin)	URISUBDIR="panel-plugins" ;;
+	*)				URISUBDIR="xfce" ;;
+esac
+
 # default SRC_URIs
 SRC_URI=(
 	${SRC_URI[*]}
-	http://mocha.xfce.org/archive/src/xfce/${PNAME}/${PVER%.*}/${SRCFILE}
+	http://mocha.xfce.org/archive/src/${URISUBDIR}/${PNAME}/${PVER%.*}/${SRCFILE}
+	http://archive.xfce.org/src/${URISUBDIR}/${PNAME}/${PVER%.*}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )