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 4bdd215..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile for source rpm: bcel
-# $Id$
-NAME := bcel
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common
diff --git a/bcel.spec b/bcel.spec
index 8b24a60..49b8ff4 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -43,7 +43,7 @@
 
 Name:           bcel
 Version:        5.2
-Release:        2jpp.1%{?dist}
+Release:        7.1%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
@@ -213,12 +213,12 @@ ant     -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
 )
 # depmap frags
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.bcel %{name} %{version} JPP %{name}
 # pom
-%if %{with_maven}
 %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
 %{__install} -m 0644 %{SOURCE7} \
-    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
-%endif
+    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+
 # javadoc
 %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
 %if %{with_maven}
@@ -264,13 +264,13 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt 
 %{_javadir}/*
-%if %{with_maven}
 %{_datadir}/maven2/poms/*
-%endif
 %{_mavendepmapfragdir}
 %if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
 %endif
 
@@ -284,6 +284,32 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-6.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 04 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-5.1
+- Do not install poms in /usr/share/maven2/default_poms
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:5.2-5
+- drop repotag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:5.2-4jpp.2
+- Autorebuild for GCC 4.3
+
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-3jpp.1
+- Merge with upstream
+
+* Mon Jan 07 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.2
+- Fixed unowned directory (Bugzilla 246185)
+
+* Fri Nov 16 2007 Ralph Apel <r.apel@r-apel.de> 0:5.2-3jpp
+- Install poms unconditionally
+- Add pom in ./maven2/default_poms
+- Add org.apache.bcel:bcel depmap frag
+
 * Wed Sep 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.1
 - Update to 5.2 in Fedora