diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 62f9f83..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: urlview
-# $Id$
-NAME := urlview
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/urlview.spec b/urlview.spec
index fe1d4e7..ed43bbc 100644
--- a/urlview.spec
+++ b/urlview.spec
@@ -1,6 +1,6 @@
 Name:           urlview
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        URL extractor/launcher
 
 Group:          Applications/Internet
@@ -33,10 +33,11 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
+mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man{1,5}}
 install -p -m644 urlview.conf.suse $RPM_BUILD_ROOT%{_sysconfdir}/urlview.conf
 install -p urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
 install -p -m644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
+echo '.so man1/urlview.1' > $RPM_BUILD_ROOT%{_mandir}/man5/urlview.conf.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/urlview
 %{_bindir}/url_handler.sh
 %{_mandir}/man1/urlview.1*
+%{_mandir}/man5/urlview.conf.5*
 
 %changelog
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar@redhat.com> 0.9-7
+- add man page link for urlview.conf (#526162)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild