diff --git a/tigervnc.changes b/tigervnc.changes
index 5a185bd..18a0d3d 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  4 11:39:54 UTC 2014 - msrb@suse.com
+
+- Fix some errors reported by rpmlint.
+
 -------------------------------------------------------------------
 Thu May 29 03:37:30 UTC 2014 - crrodriguez@opensuse.org
 
@@ -8,7 +13,6 @@ Thu May 29 03:37:30 UTC 2014 - crrodriguez@opensuse.org
   it gets built without optimization.
 - Make build verbose so it rpmlint catches errors like the above ones.
 
-
 -------------------------------------------------------------------
 Wed May 28 14:54:02 UTC 2014 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index b793230..89ebb13 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -20,7 +20,7 @@ Name:           tigervnc
 Version:        1.3.1
 Release:        0
 Provides:       tightvnc = 1.3.9
-Obsoletes:      tightvnc < 1.3.10
+Obsoletes:      tightvnc < 1.3.9
 Provides:       vnc
 BuildRequires:  Mesa-devel
 BuildRequires:  autoconf
@@ -217,11 +217,15 @@ install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
 install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
 install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
 install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
+ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer
+ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.1.gz
 
 %find_lang '%{name}'
 
 %post
-"%_sbindir/update-alternatives" --install /usr/bin/vncviewer vncviewer /usr/bin/vncviewer-tigervnc 20
+%_sbindir/update-alternatives \
+    --install %{_bindir}/vncviewer vncviewer %{_bindir}/vncviewer-tigervnc 20 \
+    --slave %{_mandir}/man1/vncviewer.1.gz  vncviewer.1.gz  %{_mandir}/man1/vncviewer-tigervnc.1.gz
 
 %postun
 if [ "$1" = 0 ] ; then
@@ -230,12 +234,15 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%ghost %{_bindir}/vncviewer
 %{_bindir}/vncviewer-tigervnc
 %exclude /usr/share/doc/tigervnc-1.3.1
 %doc LICENCE.TXT
 %doc README.txt
-%{_mandir}/man1/vncviewer-tigervnc.1*
+%ghost %_mandir/man1/vncviewer.1.gz
+%doc %_mandir/man1/vncviewer-tigervnc.1.gz
 %ghost %_sysconfdir/alternatives/vncviewer
+%ghost %_sysconfdir/alternatives/vncviewer.1.gz
 
 %files -n xorg-x11-Xvnc
 %defattr(-,root,root)
@@ -267,8 +274,8 @@ fi
 
 %exclude /var/lib/xkb/compiled/README.compiled
 
-/etc/sysconfig/SuSEfirewall2.d/services/vnc-server
-/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 
 %ifnarch s390x
 %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf