diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 5b31ca6f1b..025ea98fd1 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -4,7 +4,7 @@ _ruby_ver="2.0.0"
 _ruby_distpatchver="p195"
 _ruby_distver="${_ruby_ver}-${_ruby_distpatchver}"
 version=${_ruby_ver}${_ruby_distpatchver}
-revision=2
+revision=3
 wrksrc="${pkgname}-${_ruby_distver}"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
@@ -26,10 +26,9 @@ makedepends="readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ruby>=${version} ruby-rdoc>=${version} ruby-ri>=${version}"
-	configure_args+=" --with-baseruby=/usr/bin/ruby"
-	pre_install() {
-		# XXX wants to use target ruby
-		sed -e 's,$(Q) $(RUBY) $(GEN),$(Q) ruby $(GEN),g' -i ext/ripper/Makefile
+	pre_build() {
+		# Force getaddrinfo detection.
+		sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb
 	}
 fi