diff --git a/asm2.spec b/asm2.spec
index ca7ce64..a81ff42 100644
--- a/asm2.spec
+++ b/asm2.spec
@@ -34,7 +34,7 @@
 
 Name:           asm2
 Version:        2.2.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        A code manipulation tool to implement adaptable systems
 License:        BSD
@@ -152,6 +152,9 @@ popd
 
 rm test/perf/org/objectweb/asm/SERPPerfTest.java
 rm test/conform/adviceadapter2.xml
+# Update source/target to 1.5 to handle java generics (bug 842578)
+find -name build.xml | xargs sed -i -e 's/="1.[0-4]"/="1.5"/g'
+
 
 %build
 %if %{tests}
@@ -276,7 +279,6 @@ fi
 %endif
 
 %files
-%defattr(0644,root,root,0755)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/README.txt
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
@@ -286,27 +288,29 @@ fi
 %{_javadir}/%{name}/*.jar
 %{_javadir}/*.jar
 %{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/%{name}
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %doc %{_javadocdir}/*
 
 %files manual
-%defattr(0644,root,root,0755)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/faq.html
 %doc %{_docdir}/%{name}-%{version}/*.pdf
 
 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}-%{version}/examples
 
 %changelog
+* Tue Aug 21 2012 Orion Poplawski - 0:2.2.3-10
+- Fix mavendepfragdir owndership (bug 850000)
+- Compile with source/target 1.5 to fix java generics (bug 842578)
+- Drop defattr
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild