diff --git a/converters/ruby-lv/Makefile b/converters/ruby-lv/Makefile
index 6be78367ea07..42b07e45acd8 100644
--- a/converters/ruby-lv/Makefile
+++ b/converters/ruby-lv/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	lv
 PORTVERSION=	0.12
 CATEGORIES=	converters ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/ruby-dialogs/Makefile b/devel/ruby-dialogs/Makefile
index f0e0f61d527c..a25e6d1cebf1 100644
--- a/devel/ruby-dialogs/Makefile
+++ b/devel/ruby-dialogs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dialogs
 PORTVERSION=	1.1
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index 51a16dd1b662..f4d70aecd82d 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	filelock
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-property/Makefile b/devel/ruby-property/Makefile
index 65d870ae2e3e..02253425b00e 100644
--- a/devel/ruby-property/Makefile
+++ b/devel/ruby-property/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	property
 PORTVERSION=	19990308
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile
index 25114ba4cacc..e64b23494893 100644
--- a/devel/ruby-slang/Makefile
+++ b/devel/ruby-slang/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	slang
 PORTVERSION=	0.52
 CATEGORIES+=	devel ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 DISTNAME=	${PORTNAME}lib-${PORTVERSION:}-1m
 DIST_SUBDIR=	ruby
 
diff --git a/graphics/ruby-libpng/Makefile b/graphics/ruby-libpng/Makefile
index 7913a597d1f3..3dd328946219 100644
--- a/graphics/ruby-libpng/Makefile
+++ b/graphics/ruby-libpng/Makefile
@@ -4,14 +4,13 @@
 #
 # $FreeBSD$
 #
+#		http://www.isc.meiji.ac.jp/~ee77038/ruby/program/
 
 PORTNAME=	libpng
 PORTVERSION=	0.3.3
 PORTREVISION=	4
 CATEGORIES=	graphics ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-#		http://www.isc.meiji.ac.jp/~ee77038/ruby/program/
-MASTER_SITE_SUBDIR=	knu
+MASTER_SITES=	LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/lang/ruby-lua4/Makefile b/lang/ruby-lua4/Makefile
index 7ec96b562948..12413bdb23e1 100644
--- a/lang/ruby-lua4/Makefile
+++ b/lang/ruby-lua4/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lua
 PORTVERSION=	20010921
 PORTREVISION=	1
 CATEGORIES=	lang ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+MASTER_SITES=	LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/math/ruby-bitvector/Makefile b/math/ruby-bitvector/Makefile
index a2adb1bdea75..f7e21da22d60 100644
--- a/math/ruby-bitvector/Makefile
+++ b/math/ruby-bitvector/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bitvector
 PORTVERSION=	0.1.7
 CATEGORIES=	math ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner/ruby-contrib
+MASTER_SITES=	LOCAL/fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/security/ruby-blowfish/Makefile b/security/ruby-blowfish/Makefile
index d8d7ff091481..bc72a3df2275 100644
--- a/security/ruby-blowfish/Makefile
+++ b/security/ruby-blowfish/Makefile
@@ -9,10 +9,7 @@ PORTNAME=	blowfish
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	security ruby
-MASTER_SITES=	http://www.rubylinks.de/download/ \
-		http://www.no.rubylinks.de/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+MASTER_SITES=	LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/security/ruby-mcrypt/Makefile b/security/ruby-mcrypt/Makefile
index 25a03c599b13..c31e9f28a826 100644
--- a/security/ruby-mcrypt/Makefile
+++ b/security/ruby-mcrypt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mcrypt
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	security ruby
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+MASTER_SITES=	LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby