diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 17666b27724b..ecab583f3506 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -30,11 +31,6 @@ CONFIGURE_ARGS=	--enable-shared
 MAN1=		ruby${_RUBY_SUFFIX}.1
 MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
 
-ELISP_FILES=	inf-ruby.el ruby-mode.el rubydb3x.el
-
-EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
-XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
-
 .include <bsd.port.pre.mk>
 
 .if !empty(RUBY_SUFFIX)
@@ -68,14 +64,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
-	${MKDIR} ${RUBY_EXAMPLESDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${RUBY_EXAMPLESDIR}/misc
-	${MKDIR} ${EMACSLISPDIR}
-	${MKDIR} ${XEMACSLISPDIR}
-.for f in ${ELISP_FILES}
-	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
-	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
-.endfor
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
 	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
 	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
diff --git a/lang/ruby/pkg-message b/lang/ruby/pkg-message
index 3055e9863033..fa6533a6f165 100644
--- a/lang/ruby/pkg-message
+++ b/lang/ruby/pkg-message
@@ -1,24 +1,16 @@
 ====
-To use ruby-mode, inf-ruby and rubydb in Emacs/XEmacs, add the
-following lines to your ~/.emacs:
-
-;; Taken from the comment section in inf-ruby.el
-(setq ruby-program-name "/usr/local/bin/ruby")
-(autoload 'ruby-mode "ruby-mode" "Mode for editing ruby source files")
-(add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
-(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process")
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-(add-hook 'ruby-mode-hook '(lambda () (inf-ruby-keys)))
-====
-Note that some stuff that comes with the standard Ruby 1.6
-distribution is provided as separate ports:
+Note that some stuff that comes with the standard Ruby distribution is
+provided as separate ports:
 
 	databases/ruby-gdbm:	GDBM module
-	lang/ruby-tcltklib or japanese/ruby-tcltklib:
-				Tcl/Tk libraries
-	x11-toolkits/ruby-tk or japanese/ruby-tk:
-				Tk modules
 
+	lang/ruby-tcltklib:	Tcl/Tk libraries
+	japanese/ruby-tcltklib:	Tcl/Tk libraries for Japanized Tcl/Tk
+
+	x11-toolkits/ruby-tk:	Tk modules
+	japanese/ruby-tk:	Tk modules for Japanized Tcl/Tk
+
+	lang/ruby-mode.el:	Emacs lisp modules
+			
 Please install them as occasion demands.
 ====
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 3795cb8e87e7..79801fe1946c 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -192,26 +192,12 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/trojan.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tsvr.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uumerge.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/README
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/inf-ruby.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/ruby-mode.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/rubydb2x.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/rubydb3x.el
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/hello.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/rain.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/misc
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%
-share/emacs/site-lisp/inf-ruby.el
-share/emacs/site-lisp/ruby-mode.el
-share/emacs/site-lisp/rubydb3x.el
-@comment share/emacs/site-lisp is created by mtree
-lib/xemacs/site-lisp/inf-ruby.el
-lib/xemacs/site-lisp/ruby-mode.el
-lib/xemacs/site-lisp/rubydb3x.el
-@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 17666b27724b..ecab583f3506 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -30,11 +31,6 @@ CONFIGURE_ARGS=	--enable-shared
 MAN1=		ruby${_RUBY_SUFFIX}.1
 MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
 
-ELISP_FILES=	inf-ruby.el ruby-mode.el rubydb3x.el
-
-EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
-XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
-
 .include <bsd.port.pre.mk>
 
 .if !empty(RUBY_SUFFIX)
@@ -68,14 +64,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
-	${MKDIR} ${RUBY_EXAMPLESDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${RUBY_EXAMPLESDIR}/misc
-	${MKDIR} ${EMACSLISPDIR}
-	${MKDIR} ${XEMACSLISPDIR}
-.for f in ${ELISP_FILES}
-	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
-	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
-.endfor
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
 	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
 	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
diff --git a/lang/ruby16/pkg-message b/lang/ruby16/pkg-message
index 3055e9863033..fa6533a6f165 100644
--- a/lang/ruby16/pkg-message
+++ b/lang/ruby16/pkg-message
@@ -1,24 +1,16 @@
 ====
-To use ruby-mode, inf-ruby and rubydb in Emacs/XEmacs, add the
-following lines to your ~/.emacs:
-
-;; Taken from the comment section in inf-ruby.el
-(setq ruby-program-name "/usr/local/bin/ruby")
-(autoload 'ruby-mode "ruby-mode" "Mode for editing ruby source files")
-(add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
-(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process")
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-(add-hook 'ruby-mode-hook '(lambda () (inf-ruby-keys)))
-====
-Note that some stuff that comes with the standard Ruby 1.6
-distribution is provided as separate ports:
+Note that some stuff that comes with the standard Ruby distribution is
+provided as separate ports:
 
 	databases/ruby-gdbm:	GDBM module
-	lang/ruby-tcltklib or japanese/ruby-tcltklib:
-				Tcl/Tk libraries
-	x11-toolkits/ruby-tk or japanese/ruby-tk:
-				Tk modules
 
+	lang/ruby-tcltklib:	Tcl/Tk libraries
+	japanese/ruby-tcltklib:	Tcl/Tk libraries for Japanized Tcl/Tk
+
+	x11-toolkits/ruby-tk:	Tk modules
+	japanese/ruby-tk:	Tk modules for Japanized Tcl/Tk
+
+	lang/ruby-mode.el:	Emacs lisp modules
+			
 Please install them as occasion demands.
 ====
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 3795cb8e87e7..79801fe1946c 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -192,26 +192,12 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/trojan.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tsvr.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uumerge.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/README
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/inf-ruby.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/ruby-mode.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/rubydb2x.el
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/misc/rubydb3x.el
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/hello.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/rain.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/misc
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%
-share/emacs/site-lisp/inf-ruby.el
-share/emacs/site-lisp/ruby-mode.el
-share/emacs/site-lisp/rubydb3x.el
-@comment share/emacs/site-lisp is created by mtree
-lib/xemacs/site-lisp/inf-ruby.el
-lib/xemacs/site-lisp/ruby-mode.el
-lib/xemacs/site-lisp/rubydb3x.el
-@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true