diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index c740d5d9d346..6750c18528f0 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rdtool
-PORTVERSION=	0.6.7
-PORTREVISION=	1
+PORTVERSION=	0.6.8
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -39,6 +38,7 @@ do-configure:
 
 post-patch:
 	${RUBY} -i -pe 'gsub %r"/usr/local\b", "${PREFIX}"' ${WRKSRC}/utils/rdswap.rb
+	${RUBY} -i -pe 'gsub %r"(\(\(<URL:.*[^)])$$", "\\1>))"' ${WRKSRC}/doc/rd-draft.rd*
 
 pre-build:
 	@cd ${WRKSRC}; \
@@ -46,24 +46,20 @@ pre-build:
 
 .if !defined(NOPORTDOCS)
 post-build:
-	@cd ${WRKSRC}; \
-	${RUBY} -I. rd2 -r rd/rd2html-lib.rb README.rd.ja > README.ja.html; \
-	${RUBY} -I. rd2 -r rd/rd2html-lib.rb doc/dev-note.rd.ja > doc/dev-note.ja.html; \
-	${RUBY} -I. rd2 -r rd/rd2html-lib.rb doc/rd-draft.rd > doc/rd-draft.html; \
-	${RUBY} -I. rd2 -r rd/rd2html-lib.rb doc/rd-draft.rd.ja > doc/rd-draft.ja.html
+.for f in README.rd.ja doc/dev-note.rd.ja doc/rd-draft.rd doc/rd-draft.rd.ja
+	cd ${WRKSRC} && ${RUBY} -I. rd2 -r rd/rd2html-lib.rb ${f} \
+		> ${f:S/.rd.ja$/.ja.html/:S/.rd$/.html/}
+.endfor
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rmi2html.rb ${PREFIX}/bin/
 	${LN} -sf rmi2html.rb ${PREFIX}/bin/rmi2html
 	${INSTALL_DATA} ${WRKSRC}/rd/rd2rmi-lib.rb ${RUBY_SITELIBDIR}/rd/
-	${MKDIR} ${XEMACSLISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/utils/rd-mode.el ${XEMACSLISPDIR}/
-	${LN} -sf ${XEMACSLISPDIR}/rd-mode.el ${EMACSLISPDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/rd
-	${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${RUBY_EXAMPLESDIR}/rd/
+	${CP} ${WRKSRC}/rd/dot.rd2rc ${RUBY_EXAMPLESDIR}/rd/
 	${MKDIR} ${RUBY_DOCDIR}/rd/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd/
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index a43999f64aed..d4ca7823be8d 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1 +1 @@
-MD5 (ruby/rdtool-0.6.7.tar.gz) = 9c5cd7f36494a1eb65be2e832b772dc7
+MD5 (ruby/rdtool-0.6.8.tar.gz) = bca5c7e8ba63099362cbd84f799ea325
diff --git a/textproc/ruby-rdtool/pkg-message b/textproc/ruby-rdtool/pkg-message
index 66b95faf0165..1790e86a5dbe 100644
--- a/textproc/ruby-rdtool/pkg-message
+++ b/textproc/ruby-rdtool/pkg-message
@@ -1,8 +1,4 @@
 ************************************************************
-To use rd-mode in Emacs/XEmacs, add the following lines to
-your ~/.emacs:
-
-(autoload 'rd-mode "rd-mode"
-  "major mode for ruby document formatter RD" t)
-(add-to-list 'auto-mode-alist '("\\.rd$" . rd-mode))
+If you are an Emacs/XEmacs user, also install
+text/ruby-rd-mode.el that helps you edit RD files.
 ************************************************************
diff --git a/textproc/ruby-rdtool/pkg-plist b/textproc/ruby-rdtool/pkg-plist
index 2b51a5bb96d0..3e2ec3d6dd3d 100644
--- a/textproc/ruby-rdtool/pkg-plist
+++ b/textproc/ruby-rdtool/pkg-plist
@@ -2,8 +2,23 @@ bin/rd2
 bin/rdswap
 bin/rmi2html
 bin/rmi2html.rb
-%%RUBY_SITELIBDIR%%/rd/dot.rd2rc
+%%RUBY_SITELIBDIR%%/rd/block-element.rb
+%%RUBY_SITELIBDIR%%/rd/complex-list-item.rb
+%%RUBY_SITELIBDIR%%/rd/desclist.rb
+%%RUBY_SITELIBDIR%%/rd/document-struct.rb
+%%RUBY_SITELIBDIR%%/rd/element.rb
 %%RUBY_SITELIBDIR%%/rd/filter.rb
+%%RUBY_SITELIBDIR%%/rd/inline-element.rb
+%%RUBY_SITELIBDIR%%/rd/labeled-element.rb
+%%RUBY_SITELIBDIR%%/rd/list.rb
+%%RUBY_SITELIBDIR%%/rd/loose-struct.rb
+%%RUBY_SITELIBDIR%%/rd/methodlist.rb
+%%RUBY_SITELIBDIR%%/rd/output-format-visitor.rb
+%%RUBY_SITELIBDIR%%/rd/package.rb
+%%RUBY_SITELIBDIR%%/rd/parser-util.rb
+%%RUBY_SITELIBDIR%%/rd/rbl-file.rb
+%%RUBY_SITELIBDIR%%/rd/rbl-suite.rb
+%%RUBY_SITELIBDIR%%/rd/rd-struct.rb
 %%RUBY_SITELIBDIR%%/rd/rd2html-lib.rb
 %%RUBY_SITELIBDIR%%/rd/rd2html-opt.rb
 %%RUBY_SITELIBDIR%%/rd/rd2man-lib.rb
@@ -13,13 +28,14 @@ bin/rmi2html.rb
 %%RUBY_SITELIBDIR%%/rd/rdfmt.rb
 %%RUBY_SITELIBDIR%%/rd/rdinlineparser.tab.rb
 %%RUBY_SITELIBDIR%%/rd/rdvisitor.rb
+%%RUBY_SITELIBDIR%%/rd/reference-resolver.rb
+%%RUBY_SITELIBDIR%%/rd/search-file.rb
+%%RUBY_SITELIBDIR%%/rd/tree.rb
+%%RUBY_SITELIBDIR%%/rd/version.rb
+%%RUBY_SITELIBDIR%%/rd/visitor.rb
 @dirrm %%RUBY_SITELIBDIR%%/rd
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rd/dot.rd2rc
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rd
-lib/xemacs/site-lisp/rd-mode.el
-@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-@exec ln -sf %D/%F %D/share/emacs/site-lisp/
-@unexec rm -f %D/share/emacs/site-lisp/rd-mode.el 2>/dev/null || true
 %%PORTDOCS%%@comment %%RUBY_DOCDIR%%/amstd/ja/amstd-ja.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/rd/README.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/rd/rd-draft.html