diff --git a/gem_install.sh b/gem_install.sh
index 25a2f7c..006cfc0 100644
--- a/gem_install.sh
+++ b/gem_install.sh
@@ -52,6 +52,7 @@ fi
 
 if [ -d "$buildroot" ]; then
   find $buildroot -type f -perm /u+x | while read file; do
-    sed -i -e 's,#!/usr/local/bin/ruby,#!/usr/bin/ruby,' "$file"
+    # TODO: scripts in ruby/1.9.1 should call ruby1.9 for consistency
+    sed -i -e 's,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^ ]*/ruby,#!/usr/bin/ruby,' "$file"
   done
 fi
diff --git a/ruby-common.changes b/ruby-common.changes
index b003245..d9d4adb 100644
--- a/ruby-common.changes
+++ b/ruby-common.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 30 10:39:16 UTC 2012 - coolo@suse.com
+
+- replace all */ruby with /usr/bin/ruby
+
 -------------------------------------------------------------------
 Fri Jul 27 14:03:05 UTC 2012 - coolo@suse.com