diff --git a/lang/ruby14-irb/Makefile b/lang/ruby14-irb/Makefile
index 37b0269b9f16..e8722864d324 100644
--- a/lang/ruby14-irb/Makefile
+++ b/lang/ruby14-irb/Makefile
@@ -10,32 +10,34 @@ PORTVERSION=	0.6.1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@big.or.jp
 
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+RUBY_VER=	1.4
+
+USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/irb
-PLIST_SUB+=	RUBY_VER="${RUBY_VER}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
 	${PERL} -i -pe '$$. == 1 && s,^#!\s*\S+,#!${RUBY},' ${WRKSRC}/irb.rb
 	${RM} -f ${WRKSRC}/instirb.rb
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/irb.rb ${PREFIX}/bin/irb
-	${MKDIR} ${PREFIX}/lib/ruby/${RUBY_VER}/irb
-	${INSTALL_DATA} ${WRKSRC}/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}/irb
+	${INSTALL_SCRIPT} ${WRKSRC}/irb.rb ${PREFIX}/bin/irb${_RUBY_SUFFIX}
+	${LN} -fs irb${_RUBY_SUFFIX} ${PREFIX}/bin/irb
+	${MKDIR} ${RUBY_LIBDIR}/irb
+	${INSTALL_DATA} ${WRKSRC}/*.rb ${RUBY_LIBDIR}/irb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/irb
-	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/ruby/irb
+	${MKDIR} ${RUBY_DOCDIR}/irb
+	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}/irb
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/lang/ruby14-irb/pkg-plist b/lang/ruby14-irb/pkg-plist
index fc3e597d1c8f..a8ce9054c233 100644
--- a/lang/ruby14-irb/pkg-plist
+++ b/lang/ruby14-irb/pkg-plist
@@ -1,21 +1,22 @@
 bin/irb
-lib/ruby/%%RUBY_VER%%/irb/completion.rb
-lib/ruby/%%RUBY_VER%%/irb/frame.rb
-lib/ruby/%%RUBY_VER%%/irb/input-method.rb
-lib/ruby/%%RUBY_VER%%/irb/irb.rb
-lib/ruby/%%RUBY_VER%%/irb/loader.rb
-lib/ruby/%%RUBY_VER%%/irb/main.rb
-lib/ruby/%%RUBY_VER%%/irb/multi-irb.rb
-lib/ruby/%%RUBY_VER%%/irb/rtags.rb
-lib/ruby/%%RUBY_VER%%/irb/ruby-lex.rb
-lib/ruby/%%RUBY_VER%%/irb/ruby-token.rb
-lib/ruby/%%RUBY_VER%%/irb/slex.rb
-lib/ruby/%%RUBY_VER%%/irb/version.rb
-lib/ruby/%%RUBY_VER%%/irb/workspace-binding-2.rb
-lib/ruby/%%RUBY_VER%%/irb/workspace-binding.rb
-lib/ruby/%%RUBY_VER%%/irb/xmp.rb
-@dirrm lib/ruby/%%RUBY_VER%%/irb
-share/doc/ruby/irb/README
-share/doc/ruby/irb/README-add
-share/doc/ruby/irb/README-install
-@dirrm share/doc/ruby/irb
+bin/irb%%_RUBY_SUFFIX%%
+%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/irb.rb
+%%RUBY_LIBDIR%%/irb/loader.rb
+%%RUBY_LIBDIR%%/irb/main.rb
+%%RUBY_LIBDIR%%/irb/multi-irb.rb
+%%RUBY_LIBDIR%%/irb/rtags.rb
+%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding-2.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding.rb
+%%RUBY_LIBDIR%%/irb/xmp.rb
+@dirrm %%RUBY_LIBDIR%%/irb
+%%RUBY_DOCDIR%%/irb/README
+%%RUBY_DOCDIR%%/irb/README-add
+%%RUBY_DOCDIR%%/irb/README-install
+@dirrm %%RUBY_DOCDIR%%/irb