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 5feaa8a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: pcapdiff
-# $Id$
-NAME := pcapdiff
-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/pcapdiff.py b/pcapdiff.py
index 87ad9db..65b9419 100644
--- a/pcapdiff.py
+++ b/pcapdiff.py
@@ -2,5 +2,4 @@
 if __name__ == '__main__':
     import sys
     sys.path.insert(0, '/usr/share/pcapdiff')
-    from pcapdiff import main
-    main()
+    import pcapdiff
diff --git a/pcapdiff.spec b/pcapdiff.spec
index 91999ae..30e0194 100644
--- a/pcapdiff.spec
+++ b/pcapdiff.spec
@@ -1,6 +1,6 @@
 Name: pcapdiff
 Version: 0.1
-Release:  6%{?dist}
+Release:  7%{?dist}
 Summary: Compares packet captures, detects forged, dropped or mangled packets
 
 Group: Development/Languages
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pcapdiff/*.pyo
 
 %changelog
+* Tue Mar 20 2010 Jon Ciesla <limb@jcomserv.net> - 0.1-7
+- Fix for crash, BZ 557733.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild