diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index fd3730ba4353..592ac5d2fac2 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	eclipse
 PORTVERSION=	3.3
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_ECLIPSE}/R-${PORTVERSION}-200706251500/:0 \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/eclipse|}:1
+MASTER_SITES=	${MASTER_SITE_ECLIPSE:S|%SUBDIR%|R-${PORTVERSION}-200706251500|:S|$|:0|}/ \
+		${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/eclipse|:S|$|:1|}
 DISTFILES=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}${EXTRACT_SUFX}:0 \
 		launchersrc${EXTRACT_SUFX}:1
 DIST_SUBDIR=	eclipse