diff --git a/www/ruby-rails/Makefile b/www/ruby-rails/Makefile
index 3b4dec8c0439..013d56773f0c 100644
--- a/www/ruby-rails/Makefile
+++ b/www/ruby-rails/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/02/09 12:44:07 taca Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/23 16:51:23 taca Exp $
 
-DISTNAME=	rails-2.3.11
+DISTNAME=	rails-${RUBY_RAILS2_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,16 +8,14 @@ HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Framework for developing database-backed web applications
 LICENSE=	mit
 
-.include "../../lang/ruby/gem.mk"
+USE_RAKE=	YES
+RUBY_RAILS=	2
 
-.if ${RUBY_VER} == "18"
-DEPENDS+=	${RUBY_PKGPREFIX}-rake>=0.8.3:../../devel/rake
-.endif
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.11<2.3.12:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.3.11<2.3.12:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.11<2.3.12:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.3.11<2.3.12:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.3.11<2.3.12:../../www/ruby-activeresource
+DEPENDS+=	${RUBY_ACTIVESUPPORT_DEPENDS}
+DEPENDS+=	${RUBY_ACTIVERECORD_DEPENDS}
+DEPENDS+=	${RUBY_ACTIONPACK_DEPENDS}
+DEPENDS+=	${RUBY_ACTIONMAILER_DEPENDS}
+DEPENDS+=	${RUBY_ACTIVERESOURCE_DEPENDS}
 
 CONFLICTS+=	ruby[1-9][0-9]-rails-[0-9]* rails-[0-9]*
 
@@ -27,4 +25,5 @@ REPLACE_RUBY_PAT=	*
 pre-configure:
 	${RM} -f ${WRKSRC}/railties-3.0.0.beta3.gem
 
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"