diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 3f414fbc5c7..b687f15818e 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,42 +1,48 @@
 # Template build file for 'ruby'.
 pkgname=ruby
-_ruby_ver="1.9.3"
-_ruby_distpatchver="p327"
+_ruby_ver="2.0.0"
+_ruby_distpatchver="p195"
 _ruby_distver="${_ruby_ver}-${_ruby_distpatchver}"
 version=${_ruby_ver}${_ruby_distpatchver}
 revision=1
 wrksrc="${pkgname}-${_ruby_distver}"
-build_style=gnu-configure
-configure_args="--enable-shared --disable-rpath
- DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
-makedepends="pkg-config bison groff doxygen graphviz ncurses-devel \
- readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel pango-devel"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
-distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${_ruby_distver}.tar.bz2"
-checksum=d989465242f9b11a8a3aa8cbd2c75a9b3a8c0ec2f14a087a0c7b51abf164e488
+distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.0/$pkgname-${_ruby_distver}.tar.bz2"
+checksum=0be32aef7a7ab6e3708cc1d65cd3e0a99fa801597194bbedd5799c11d652eb5b
 long_desc="
  Ruby is the interpreted scripting language for quick and easy object
  oriented programming. It has many features to process text files and to
  do system management tasks (as in Perl). It is simple, straight-forward
  and extensible."
 
+build_style=gnu-configure
+configure_args="--enable-shared --disable-rpath
+ DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
+hostmakedepends="pkg-config bison groff doxygen graphviz"
+makedepends="readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel pango-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" ruby>=${version}"
+	configure_args+=" --with-baseruby=/usr/bin/ruby"
+fi
+
 ruby-devel_package() {
 	depends="ruby-${version}_${revision}"
-	short_desc="ruby development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove usr/lib/ruby/1.9.1/mkmf.rb
+		vmove usr/lib/ruby/2.0.0/mkmf.rb
 		vmove usr/share/doc
 		vmove usr/lib/pkgconfig
 	}
 }
 
 ruby-gems_package() {
-	depends="ruby-rdoc ruby"
+	depends="ruby-rdoc>=${version}"
 	short_desc="Package management framework for Ruby libraries/applications"
 	noarch=yes
 	pkg_install() {
@@ -51,23 +57,23 @@ ruby-irb_package() {
 	noarch=yes
 	pkg_install() {
 		vmove usr/bin/irb
-		vmove usr/lib/ruby/1.9.1/irb
+		vmove usr/lib/ruby/2.0.0/irb
 		vmove "usr/share/man/man1/irb*"
 	}
 }
 
 ruby-rdoc_package() {
-	depends="ruby-irb ruby"
+	depends="ruby-irb>=${version}"
 	short_desc="Generate documentation from Ruby source files"
 	noarch=yes
 	pkg_install() {
 		vmove usr/bin/rdoc
-		vmove usr/lib/ruby/1.9.1/rdoc
+		vmove usr/lib/ruby/2.0.0/rdoc
 	}
 }
 
 ruby-ri_package() {
-	depends="ruby-rdoc ruby"
+	depends="ruby-rdoc>=${version}"
 	short_desc="Ruby Interactive reference"
 	noarch=yes
 	pkg_install() {
@@ -79,6 +85,6 @@ ruby-ri_package() {
 
 ruby_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }