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 b8e65af..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: epel-release
-# $Id$
-NAME := epel-release
-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/dead.package b/dead.package
new file mode 100644
index 0000000..3974481
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+epel-release does not need to be in devel branch.  Is obviously only used for EPEL and not rawhide.
diff --git a/epel-release.spec b/epel-release.spec
new file mode 100644
index 0000000..ec0b31f
--- /dev/null
+++ b/epel-release.spec
@@ -0,0 +1,91 @@
+Name:           epel-release       
+Version:        6
+Release:        2
+Summary:        Extra Packages for Enterprise Linux repository configuration
+
+Group:          System Environment/Base 
+License:        GPLv2
+
+# This is a Red Hat maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
+URL:            http://download.fedora.redhat.com/pub/epel
+Source0:        http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL
+Source1:        GPL	
+Source2:        epel.repo	
+Source3:        epel-testing.repo	
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:     noarch
+Requires:      redhat-release >=  %{version} 
+
+%description
+This package contains the Extra Packages for Enterprise Linux (EPEL) repository
+GPG key as well as configuration for yum and up2date.
+
+%prep
+%setup -q  -c -T
+install -pm 644 %{SOURCE0} .
+install -pm 644 %{SOURCE1} .
+
+%build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+#GPG Key
+install -Dpm 644 %{SOURCE0} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL
+
+# yum
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+install -pm 644 %{SOURCE2} %{SOURCE3}  \
+    $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+echo "# epel repo -- added by epel-release " \
+    >> %{_sysconfdir}/sysconfig/rhn/sources
+echo "yum epel http://download.fedora.redhat.com/pub/epel/%{version}/\$ARCH" \
+    >> %{_sysconfdir}/sysconfig/rhn/sources
+
+%postun 
+sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources
+sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources
+
+
+%files
+%defattr(-,root,root,-)
+%doc GPL
+%config(noreplace) /etc/yum.repos.d/*
+/etc/pki/rpm-gpg/*
+
+
+%changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 6.1
+- fix license tag
+
+* Sun Mar 25 2007 Michael Stahnke <mastahnke@gmail.com> - 6-0
+- Bumped in devel to RHEL 6. (We can dream).
+
+* Sun Mar 25 2007 Michael Stahnke <mastahnke@gmail.com> - 4-4
+- Changed description again
+
+* Sun Mar 25 2007 Michael Stahnke <mastahnke@gmail.com> - 4-3
+- Removed cp in postun
+- Removed the file epel-release - provides no value
+- Removed dist tag as per review bug #233236
+- Changed description
+
+* Mon Mar 14 2007 Michael Stahnke <mastahnke@gmail.com> - 4-2
+- Fixed up2date issues. 
+
+* Mon Mar 12 2007 Michael Stahnke <mastahnke@gmail.com> - 4-1
+- Initial Package