diff --git a/mailx.changes b/mailx.changes
index 64a9940..0c5f757 100644
--- a/mailx.changes
+++ b/mailx.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 19 09:47:38 UTC 2018 - Dr. Werner Fink <werner@suse.de>
+
+- Repair ghost links used by update-alternatives
+
 -------------------------------------------------------------------
 Wed Oct 31 18:30:32 UTC 2018 - Cristian Rodríguez <crrodriguez@opensuse.org>
 
diff --git a/mailx.spec b/mailx.spec
index eb5a78d..8df5468 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -96,11 +96,18 @@ minor enhancements like the ability to set a "From:" address.
     %make_install PREFIX=/usr
     rm -rf %{buildroot}/bin
     mkdir  %{buildroot}/bin
-    ln -sf ../usr/bin/mailx %{buildroot}/bin/mail
-    ln -sf mailx %{buildroot}/usr/bin/Mail
-    ln -sf mailx %{buildroot}/usr/bin/mail
-    ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/Mail.1.gz
-    ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/mail.1.gz
+    mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+    ln -sf %{_sysconfdir}/alternatives/binmail %{buildroot}/bin/mail
+    ln -sf %{_sysconfdir}/alternatives/Mail    %{buildroot}/usr/bin/Mail
+    ln -sf %{_sysconfdir}/alternatives/mail    %{buildroot}/usr/bin/mail
+    ln -sf %{_sysconfdir}/alternatives/Mail.1%{?ext_man} %{buildroot}%{_mandir}/man1/Mail.1%{?ext_man}
+    ln -sf %{_sysconfdir}/alternatives/mail.1%{?ext_man} %{buildroot}%{_mandir}/man1/mail.1%{?ext_man}
+    #
+    ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/binmail
+    ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/Mail
+    ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/mail
+    ln -sf %{_mandir}/man1/mailx.1%{?ext_man} %{buildroot}%{_sysconfdir}/alternatives/Mail.1%{?ext_man}
+    ln -sf %{_mandir}/man1/mailx.1%{?ext_man} %{buildroot}%{_sysconfdir}/alternatives/mail.1%{?ext_man}
     install -m 0644 mail.rc %{buildroot}/etc
     mkdir -p %{buildroot}%{_defaultdocdir}/%{name}