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 26bd3e6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: mon
-# $Id: Makefile,v 1.1 2008/07/23 15:58:31 kevin Exp $
-NAME := mon
-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 $$d/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/mon.spec b/mon.spec
index 3ebe910..e83f4d1 100644
--- a/mon.spec
+++ b/mon.spec
@@ -1,12 +1,13 @@
 # TODO: Split monitors and alerts into subpackages
 #       they drag in way too much dependencies
 
-%define moncgi_version 1.52
+%global moncgi_version 1.52
+%global fixlib sed 's,/usr/lib,%{_libdir},g'
 
 Name:           mon
 Summary:        General-purpose resource monitoring system
 Version:        1.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.kernel.org/software/mon/
@@ -22,6 +23,11 @@ Source5:        userfile
 Patch0:         mon-1.2.0-perl.patch
 Patch1:         mon-1.2.0-uucp.patch
 
+Requires:       perl(Authen::PAM)
+Requires:       iputils
+Requires:       fping
+Requires:       traceroute
+
 BuildRequires:  dos2unix
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,8 +97,9 @@ install -p -m0755 mon.d/*.wrap mon.d/*.monitor $RPM_BUILD_ROOT%{_libdir}/mon/mon
 install -p -m0755 alert.d/* $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 
-install -Dp -m0644 etc/auth.cf $RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf
-install -Dp -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/mon
+%{fixlib} etc/auth.cf >$RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf
+%{fixlib} %{SOURCE3} >$RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf
 install -Dp -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/mon
 install -Dp -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mon/userfile
 
@@ -107,6 +114,9 @@ chmod -x mon.cgi-1.52/mon.cgi                   \
         clients/batch-example                   \
         utils/syslog.monitor
 
+# Fix library path in examples
+%{fixlib} -i etc/*.cf
+
 
 
 %clean
@@ -162,6 +172,10 @@ fi
 
 
 %changelog
+* Wed Apr 21 2010 Lubomir Rintel (GoodData) <lubo.rintel@gooddata.com> - 1.2.0-6
+- Add missing dependencies (#584281)
+- Fix path to libdir for 64-bits
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild