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 45d6ab2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: dissy
-# $Id$
-NAME := dissy
-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/dissy.spec b/dissy.spec
index d7f440b..eb93b4b 100644
--- a/dissy.spec
+++ b/dissy.spec
@@ -2,7 +2,7 @@
 
 Name:           dissy
 Version:        8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical frontend to the objdump disassembler
 
 Group:          Development/Tools
@@ -66,10 +66,16 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?fedora} > 8
 %{python_sitelib}/*.egg-info
 %endif
+%if 0%{?rhel} > 5
+%{python_sitelib}/*.egg-info
+%endif
 %doc COPYING README
 
 
 %changelog
+* Fri Jul 09 2010 Lubomir Rintel <lkundrak@v3.sk> - 8-5
+- Package egg info in RHEL 6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild