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 b923d32..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: sqlgrey
-# $Id$
-NAME := sqlgrey
-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/sqlgrey.init b/sqlgrey.init
index 1703cc0..e7602bf 100644
--- a/sqlgrey.init
+++ b/sqlgrey.init
@@ -47,6 +47,7 @@ case "$1" in
 
     status)
         status sqlgrey
+        RETVAL=$?
         ;;
 
     reload)
diff --git a/sqlgrey.spec b/sqlgrey.spec
index 53bf20d..5f0eeff 100644
--- a/sqlgrey.spec
+++ b/sqlgrey.spec
@@ -1,6 +1,6 @@
 Name:           sqlgrey
 Version:        1.7.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Postfix grey-listing policy service
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -82,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Sat Jul 23 2016 Kevin Fenzi <kevin@scrye.com> - 1.7.6-4
+- Fix status in service file. Fixes bug #1358021
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild