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 537d8ee..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zoneminder
-# $Id$
-NAME := zoneminder
-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/zoneminder.spec b/zoneminder.spec
index 5dc2a60..dec8770 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.23.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -155,7 +155,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
-%config(noreplace) %attr(600,%{zmuid_final},%{zmgid_final}) %{_sysconfdir}/zm.conf
+%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
 %attr(755,root,root) %{_initrddir}/zoneminder
 
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
 * Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
 - Initial attempt at packaging 1.23.