diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index ff5fefe6705..12bc4b90358 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,44 +1,44 @@
-# $OpenBSD: Makefile,v 1.16 2001/10/29 23:01:07 krw Exp $
+# $OpenBSD: Makefile,v 1.17 2002/02/21 00:48:11 krw Exp $
 
 COMMENT=	object oriented script language with threads
-VERSION=1.6.5
-DISTNAME=ruby-${VERSION}
-CATEGORIES = lang
+VERSION=	1.6.6
+DISTNAME=	ruby-${VERSION}
+CATEGORIES=	lang
 NEED_VERSION=	1.362
-MASTER_SITES=ftp://ftp.netlab.co.jp/pub/lang/ruby/ \
-    ftp://ftp.iij.ad.jp/pub/lang/ruby/ \
-    ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
-    ftp://ftp.krnet.ne.jp/pub/ruby/ 
+MASTER_SITES=	ftp://www.ruby-lang.org/pub/ruby/ \
+		ftp://mirror.nucba.ac.jp/pub/ruby/ \
+		ftp://ftp.kr.freebsd.org/pub/ruby/
 
-MASTER_SITES0=${MASTER_SITES:C,$,doc/,}
+MASTER_SITES0=	${MASTER_SITES:C,$,doc/,}
 
-BINARCH=${DISTNAME}.tar.gz
-MANARCH=ruby-man-1.4.6.tar.gz
-DISTFILES=${BINARCH} ${MANARCH}:0
-EXTRACT_ONLY=${BINARCH}
+BINARCH=	${DISTNAME}.tar.gz
+MANARCH=	ruby-man-1.4.6.tar.gz
+DISTFILES=	${BINARCH} ${MANARCH}:0
+EXTRACT_ONLY=	${BINARCH}
 
-HOMEPAGE=http://www.ruby-lang.org/
+HOMEPAGE=	http://www.ruby-lang.org/
 MAINTAINER=	Ken Westerback <krw@openbsd.org>
+
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 
-LIB_DEPENDS=tcl83.::lang/tcl/8.3 \
-            tk83.::x11/tk/8.3
+LIB_DEPENDS=	tcl83.::lang/tcl/8.3 \
+		tk83.::x11/tk/8.3
 
 CONFIGURE_STYLE=	autoconf
-SEPARATE_BUILD=	concurrent
+SEPARATE_BUILD=		concurrent
 
-CONFIGURE_ENV=YACC=yacc
-CONFIGURE_ARGS=${CONFIGURE_SHARED} \
-    --with-tcl-include=${PREFIX}/include/tcl8.3 \
-    --with-tk-include=${PREFIX}/include/tk8.3 \
-    --with-X11-dir=${X11BASE} 
+CONFIGURE_ENV=	YACC=yacc
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--with-tcl-include=${PREFIX}/include/tcl8.3 \
+		--with-tk-include=${PREFIX}/include/tk8.3 \
+		--with-X11-dir=${X11BASE} 
 
 # Force rebuild of parse.c with yacc
 post-extract: 
-	cd ${WRKSRC} && rm parse.c 
+	cd ${WRKSRC} && rm parse.c
 
 # buglet fix: lex.c should be in object dir
 post-configure:
diff --git a/lang/ruby/files/md5 b/lang/ruby/distinfo
similarity index 51%
rename from lang/ruby/files/md5
rename to lang/ruby/distinfo
index 68e7943cf10..7b5c64ab3c2 100644
--- a/lang/ruby/files/md5
+++ b/lang/ruby/distinfo
@@ -1,6 +1,6 @@
-MD5 (ruby-1.6.5.tar.gz) = 1f055e7c92c04acab27b0b4cdca4f10f
+MD5 (ruby-1.6.6.tar.gz) = 4448a497bde57028be6469f5d5ddf5cf
 MD5 (ruby-man-1.4.6.tar.gz) = 8eed63fec14a719df26247fb8384db5e
-RMD160 (ruby-1.6.5.tar.gz) = b9bcee9b915a5109a86ce5e1ab620cc13bebd725
+RMD160 (ruby-1.6.6.tar.gz) = 537726c5a73afcbb7146bcf5ba2a09b967d9e00e
 RMD160 (ruby-man-1.4.6.tar.gz) = 105afe2236d7e16c8fef8e87d1577975b3c635e4
-SHA1 (ruby-1.6.5.tar.gz) = e3a9e1d82405a34d1558f043fa1999b26dc63978
+SHA1 (ruby-1.6.6.tar.gz) = 922712ae41b51e255e43bcc421b566507b7c8278
 SHA1 (ruby-man-1.4.6.tar.gz) = 9ecb0e32d573a090f932fcac5c28f6efcaaa50c0
diff --git a/lang/ruby/files/PLIST.template b/lang/ruby/files/PLIST.template
deleted file mode 100644
index 36bd6d7a6be..00000000000
--- a/lang/ruby/files/PLIST.template
+++ /dev/null
@@ -1,176 +0,0 @@
-@comment $OpenBSD: PLIST.template,v 1.2 2000/05/18 18:37:59 espie Exp $
-bin/ruby
-@exec mkdir -p %D/lib/ruby/site_ruby/REV/SUB
-lib/ruby/REV/English.rb
-lib/ruby/REV/Env.rb
-lib/ruby/REV/base64.rb
-lib/ruby/REV/cgi-lib.rb
-lib/ruby/REV/cgi.rb
-lib/ruby/REV/cgi/session.rb
-lib/ruby/REV/complex.rb
-lib/ruby/REV/date.rb
-lib/ruby/REV/date2.rb
-lib/ruby/REV/debug.rb
-lib/ruby/REV/delegate.rb
-lib/ruby/REV/e2mmap.rb
-lib/ruby/REV/eregex.rb
-lib/ruby/REV/expect.rb
-lib/ruby/REV/final.rb
-lib/ruby/REV/finalize.rb
-lib/ruby/REV/find.rb
-lib/ruby/REV/ftools.rb
-lib/ruby/REV/ftplib.rb
-lib/ruby/REV/getoptlong.rb
-lib/ruby/REV/getopts.rb
-ifdef(`DYNAMIC',dnl
-lib/libruby.so
-lib/libruby.so.1.4.4
-@exec /sbin/ldconfig -m %B
-lib/ruby/REV/SUB/curses.so
-lib/ruby/REV/SUB/dbm.so
-lib/ruby/REV/SUB/etc.so
-lib/ruby/REV/SUB/fcntl.so
-lib/ruby/REV/SUB/md5.so
-lib/ruby/REV/SUB/nkf.so
-lib/ruby/REV/SUB/pty.so
-lib/ruby/REV/SUB/sdbm.so
-lib/ruby/REV/SUB/socket.so
-lib/ruby/REV/SUB/tcltklib.so
-lib/ruby/REV/SUB/tkutil.so
-)dnl
-lib/ruby/REV/SUB/config.h
-lib/ruby/REV/SUB/defines.h
-lib/ruby/REV/SUB/dln.h
-lib/ruby/REV/SUB/env.h
-lib/ruby/REV/SUB/intern.h
-lib/ruby/REV/SUB/libruby.a
-lib/ruby/REV/SUB/node.h
-lib/ruby/REV/SUB/rbconfig.rb
-lib/ruby/REV/SUB/re.h
-lib/ruby/REV/SUB/regex.h
-lib/ruby/REV/SUB/ruby.h
-lib/ruby/REV/SUB/rubyio.h
-lib/ruby/REV/SUB/rubysig.h
-lib/ruby/REV/SUB/st.h
-lib/ruby/REV/SUB/util.h
-lib/ruby/REV/SUB/version.h
-lib/ruby/REV/importenv.rb
-lib/ruby/REV/irb/completion.rb
-lib/ruby/REV/irb/frame.rb
-lib/ruby/REV/irb/input-method.rb
-lib/ruby/REV/irb/loader.rb
-lib/ruby/REV/irb/main.rb
-lib/ruby/REV/irb/multi-irb.rb
-lib/ruby/REV/irb/ruby-lex.rb
-lib/ruby/REV/irb/ruby-token.rb
-lib/ruby/REV/irb/slex.rb
-lib/ruby/REV/irb/version.rb
-lib/ruby/REV/irb/workspace-binding-2.rb
-lib/ruby/REV/irb/workspace-binding.rb
-lib/ruby/REV/irb/xmp.rb
-lib/ruby/REV/jcode.rb
-lib/ruby/REV/kconv.rb
-lib/ruby/REV/mailread.rb
-lib/ruby/REV/mathn.rb
-lib/ruby/REV/matrix.rb
-lib/ruby/REV/mkmf.rb
-lib/ruby/REV/monitor.rb
-lib/ruby/REV/mutex_m.rb
-lib/ruby/REV/net/pop.rb
-lib/ruby/REV/net/session.rb
-lib/ruby/REV/net/smtp.rb
-lib/ruby/REV/observer.rb
-lib/ruby/REV/open3.rb
-lib/ruby/REV/ostruct.rb
-lib/ruby/REV/parsearg.rb
-lib/ruby/REV/parsedate.rb
-lib/ruby/REV/ping.rb
-lib/ruby/REV/profile.rb
-lib/ruby/REV/pstore.rb
-lib/ruby/REV/rational.rb
-lib/ruby/REV/readbytes.rb
-lib/ruby/REV/shellwords.rb
-lib/ruby/REV/singleton.rb
-lib/ruby/REV/sync.rb
-lib/ruby/REV/tcltk.rb
-lib/ruby/REV/telnet.rb
-lib/ruby/REV/tempfile.rb
-lib/ruby/REV/thread.rb
-lib/ruby/REV/thwait.rb
-lib/ruby/REV/timeout.rb
-lib/ruby/REV/tk.rb
-lib/ruby/REV/tkafter.rb
-lib/ruby/REV/tkbgerror.rb
-lib/ruby/REV/tkcanvas.rb
-lib/ruby/REV/tkclass.rb
-lib/ruby/REV/tkdialog.rb
-lib/ruby/REV/tkentry.rb
-lib/ruby/REV/tkfont.rb
-lib/ruby/REV/tkmenubar.rb
-lib/ruby/REV/tkmngfocus.rb
-lib/ruby/REV/tkpalette.rb
-lib/ruby/REV/tkscrollbox.rb
-lib/ruby/REV/tktext.rb
-lib/ruby/REV/tkvirtevent.rb
-lib/ruby/REV/tracer.rb
-lib/ruby/REV/weakref.rb
-man/man1/ruby.1
-share/doc/ruby/NilClass.html
-share/doc/ruby/Exception.html
-share/doc/ruby/Errno.html
-share/doc/ruby/classes.html
-share/doc/ruby/Bignum.html
-share/doc/ruby/Numeric.html
-share/doc/ruby/Time.html
-share/doc/ruby/ENV.html
-share/doc/ruby/function.html
-share/doc/ruby/Hash.html
-share/doc/ruby/options.html
-share/doc/ruby/Kernel.html
-share/doc/ruby/Enum.html
-share/doc/ruby/index.html
-share/doc/ruby/Class.html
-share/doc/ruby/Compar.html
-share/doc/ruby/Float.html
-share/doc/ruby/FileTest.html
-share/doc/ruby/File.html
-share/doc/ruby/Fixnum.html
-share/doc/ruby/IO.html
-share/doc/ruby/Integer.html
-share/doc/ruby/Object.html
-share/doc/ruby/ObSpace.html
-share/doc/ruby/Range.html
-share/doc/ruby/Regexp.html
-share/doc/ruby/dbm.html
-share/doc/ruby/glossary.html
-share/doc/ruby/preface.html
-share/doc/ruby/socket.html
-share/doc/ruby/syntax.html
-share/doc/ruby/variable.html
-share/doc/ruby/yacc.html
-share/doc/ruby/Array.html
-share/doc/ruby/Dir.html
-share/doc/ruby/Data.html
-share/doc/ruby/GC.html
-share/doc/ruby/Module.html
-share/doc/ruby/Marshal.html
-share/doc/ruby/Match.html
-share/doc/ruby/Math.html
-share/doc/ruby/Proc.html
-share/doc/ruby/Process.html
-share/doc/ruby/Prec.html
-share/doc/ruby/Struct.html
-share/doc/ruby/String.html
-share/doc/ruby/bundle.html
-share/doc/ruby/kconv.html
-share/doc/ruby/thread.html
-@dirrm share/doc/ruby
-@dirrm lib/ruby/site_ruby
-@dirrm lib/ruby/site_ruby/REV/SUB
-@dirrm lib/ruby/site_ruby/REV
-@dirrm lib/ruby/REV/net
-@dirrm lib/ruby/REV/irb
-@dirrm lib/ruby/REV/cgi
-@dirrm lib/ruby/REV/SUB
-@dirrm lib/ruby/REV
-@dirrm lib/ruby
diff --git a/lang/ruby/pkg/PFRAG.shared b/lang/ruby/pkg/PFRAG.shared
index 5f2f83e0bb3..5d854ef5a2e 100644
--- a/lang/ruby/pkg/PFRAG.shared
+++ b/lang/ruby/pkg/PFRAG.shared
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2001/10/26 01:25:06 krw Exp $
-lib/libruby.so.${REV}.5
+@comment $OpenBSD: PFRAG.shared,v 1.9 2002/02/21 00:48:11 krw Exp $
+lib/libruby.so.${REV}.6
 DYNLIBDIR(%B)
 lib/ruby/${REV}/${SUB}/curses.so
 lib/ruby/${REV}/${SUB}/dbm.so