diff --git a/gem_install.sh b/gem_install.sh
index 757b937..9fd1221 100644
--- a/gem_install.sh
+++ b/gem_install.sh
@@ -246,13 +246,14 @@ if options.symlinkbinaries && File.exists?(bindir)
       unversioned = map_executable(options, unversioned)
       File.rename(default_path, full_versioned)
       patchfile(full_versioned,  />= 0(\.a)?/, "= #{options.gemversion}")
+      link_target = File.join(Gem.bindir, full_versioned)
       # unversioned
       [unversioned, ruby_versioned, gem_versioned].each do |linkname|
         full_path = File.join(br_ua_dir, linkname)
         ua_path   = File.join(options.ua_dir, linkname)
-        GILogger.info "Linking '#{linkname}' to '#{full_path}'"
-        File.symlink(linkname, full_path) unless File.symlink? full_path
-        GILogger.info "Linking '#{ua_path}' to '#{linkname}'"
+        GILogger.info "Symlinking '#{full_path} -> '#{linkname}'"
+        File.symlink(link_target, full_path) unless File.symlink? full_path
+        GILogger.info "Symlinking '#{linkname}' -> '#{ua_path}'"
         File.symlink(ua_path, linkname) unless File.symlink? linkname
       end
     end
diff --git a/ruby-common.changes b/ruby-common.changes
index 1b0c09e..c0cbe55 100644
--- a/ruby-common.changes
+++ b/ruby-common.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul  8 12:10:25 UTC 2021 - Stephan Kulow <coolo@suse.com>
+
+- Fix the links in /etc/alternatives not to point to themselves
+
 -------------------------------------------------------------------
 Tue Jan 26 01:46:30 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>