diff --git a/converters/ruby-lv/Makefile b/converters/ruby-lv/Makefile
index 788db3f2c516..f3d79dc30756 100644
--- a/converters/ruby-lv/Makefile
+++ b/converters/ruby-lv/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	lv
 PORTVERSION=	0.12
 CATEGORIES=	converters ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index adbcf0c1b872..87caf91c066c 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	oniguruma
 PORTVERSION=	2.3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.geocities.jp/kosako1/oniguruma/archive/ \
-		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 DISTNAME=	onigd${PORTVERSION:S/./_/g}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile
index adbcf0c1b872..87caf91c066c 100644
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	oniguruma
 PORTVERSION=	2.3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.geocities.jp/kosako1/oniguruma/archive/ \
-		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 DISTNAME=	onigd${PORTVERSION:S/./_/g}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
index adbcf0c1b872..87caf91c066c 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	oniguruma
 PORTVERSION=	2.3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.geocities.jp/kosako1/oniguruma/archive/ \
-		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 DISTNAME=	onigd${PORTVERSION:S/./_/g}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-dialogs/Makefile b/devel/ruby-dialogs/Makefile
index a6bde6dddcba..67e63d08d0b3 100644
--- a/devel/ruby-dialogs/Makefile
+++ b/devel/ruby-dialogs/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	dialogs
 PORTVERSION=	1.1
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index 29a99fda5b95..48001b604301 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	filelock
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-property/Makefile b/devel/ruby-property/Makefile
index 2c7b297a8cdb..6198c4c8f977 100644
--- a/devel/ruby-property/Makefile
+++ b/devel/ruby-property/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	property
 PORTVERSION=	19990308
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	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 3cacb4e2ac1c..c324737366d2 100644
--- a/devel/ruby-slang/Makefile
+++ b/devel/ruby-slang/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	slang
 PORTVERSION=	0.52
 CATEGORIES+=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 DISTNAME=	${PORTNAME}lib-${PORTVERSION:}-1m
 DIST_SUBDIR=	ruby
 
diff --git a/irc/ruby-irc/Makefile b/irc/ruby-irc/Makefile
index af9a7a3300e3..c6a11557310d 100644
--- a/irc/ruby-irc/Makefile
+++ b/irc/ruby-irc/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	irc
 PORTVERSION=	0.14
 CATEGORIES=	irc ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/math/ruby-bitvector/Makefile b/math/ruby-bitvector/Makefile
index 9da93d0249e3..97633dec9096 100644
--- a/math/ruby-bitvector/Makefile
+++ b/math/ruby-bitvector/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	bitvector
 PORTVERSION=	0.1.7
 CATEGORIES=	math ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fenner/ruby-contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby