diff --git a/msv.spec b/msv.spec
index 23b65eb..9ad41ee 100644
--- a/msv.spec
+++ b/msv.spec
@@ -37,7 +37,7 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.3%{?dist}
 Epoch:          1
 License:        BSD
 URL:            http://msv.dev.java.net
@@ -277,6 +277,16 @@ popd
 
 ant release
 
+pushd msv/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
+pushd xsdlib/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -345,7 +355,7 @@ cp -pr xsdlib/dist/examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/xsdl
 
 %if %{gcj_support}
 #export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm --exclude usr/share/%{name}-%{version}/%{name}
+%{_bindir}/aot-compile-rpm 
 %endif
 
 %clean
@@ -473,6 +483,10 @@ fi
 
 
 %changelog
+* Wed Sep 12 2007 Matt Wringe <mwringe@redhat.com> 0:1,2-0.1.20050722.3jpp.3
+- Make package build with new gcj. Remove .class files from demo package and
+  remove demo exclude from aot-compile-rpm 
+
 * Tue Sep 11 2007 Matt Wringe <mwringe@redhat.com> 0:1.2-0.1.20050722.3jpp.2
 - Fix unowned directories
 - Change copyright files to utf-8 format