diff --git a/0001-Remove-aspecj-support.patch b/0001-Remove-aspecj-support.patch
deleted file mode 100644
index 2a146bf..0000000
--- a/0001-Remove-aspecj-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b05bf5d939333cf075a784f78fb23ac04165351a Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Wed, 19 Jan 2011 18:10:47 +0100
-Subject: [PATCH] Remove aspecj support
-
----
- plexus-compilers/pom.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml
-index db80082..ab4c702 100644
---- a/plexus-compilers/pom.xml
-+++ b/plexus-compilers/pom.xml
-@@ -15,7 +15,6 @@
-   <name>Plexus Compilers</name>
- 
-   <modules>
--    <module>plexus-compiler-aspectj</module>
-     <module>plexus-compiler-csharp</module>
-     <module>plexus-compiler-eclipse</module>
-     <module>plexus-compiler-jikes</module>
--- 
-1.7.3.4
-
diff --git a/generate_tarball.sh b/generate_tarball.sh
new file mode 100644
index 0000000..fc193f7
--- /dev/null
+++ b/generate_tarball.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+baseurl="https://github.com/sonatype/plexus-compiler"
+
+
+dname=$(basename ${baseurl})
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $version
+
+git clone "${baseurl}.git"
+
+GIT_DIR="${dname}/.git" git archive --prefix "${dname}-${version}/" \
+    ${dname}-${version} | xz > ${dname}-${version}.tar.xz
+
+
+
diff --git a/plexus-compiler-1.5.2-JikesCompiler.patch b/plexus-compiler-1.5.2-JikesCompiler.patch
deleted file mode 100644
index d3291f8..0000000
--- a/plexus-compiler-1.5.2-JikesCompiler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- plexus-compilers/plexus-compiler-jikes/src/main/java/org/codehaus/plexus/compiler/jikes/JikesCompiler.java.sav	2006-05-30 13:06:25.000000000 +0200
-+++ plexus-compilers/plexus-compiler-jikes/src/main/java/org/codehaus/plexus/compiler/jikes/JikesCompiler.java	2006-05-30 13:08:18.000000000 +0200
-@@ -289,4 +289,9 @@
- 
-         return new CompilerError( file, type.equals( "error" ), startline, startcolumn, endline, endcolumn, message );
-     }
-+
-+    public String[] createCommandLine(CompilerConfiguration config ) throws CompilerException
-+    {
-+        return null;
-+    }
- }
diff --git a/plexus-compiler-ignoreOptionalProblems.patch b/plexus-compiler-ignoreOptionalProblems.patch
new file mode 100644
index 0000000..a7b9877
--- /dev/null
+++ b/plexus-compiler-ignoreOptionalProblems.patch
@@ -0,0 +1,18 @@
+diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+index 49d890d..b6952b9 100644
+--- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
++++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+@@ -404,6 +404,13 @@ public class EclipseJavaCompiler
+ 
+             return result;
+         }
++
++        // added in recent JDT versions
++        public boolean ignoreOptionalProblems() 
++        {
++            return false;
++        }
++
+     }
+ 
+     private class EclipseCompilerINameEnvironment
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 550328e..838abd1 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -34,7 +34,7 @@
 
 Name:       plexus-compiler
 Version:    1.9.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      0
 Summary:    Compiler call initiators for Plexus
 License:    MIT
@@ -44,7 +44,7 @@ URL:        http://plexus.codehaus.org/
 # wget  https://github.com/sonatype/plexus-compiler/tarball/plexus-compiler-1.8.3
 Source0:    sonatype-plexus-compiler-plexus-compiler-1.9.1-0-%{githash}.tar.gz
 
-Patch0:     0001-Remove-aspecj-support.patch
+Patch0:     plexus-compiler-ignoreOptionalProblems.patch
 
 BuildArch:      noarch
 BuildRequires:  maven
@@ -90,9 +90,10 @@ API documentation for %{name}.
 %setup -q -n sonatype-plexus-compiler-%{dirhash}
 %patch0 -p1
 
+%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
 
 # don't build/install compiler-test module, it needs maven2 test harness
-sed -i 's:<module>plexus-compiler-test</module>::' pom.xml
+%pom_disable_module plexus-compiler-test
 
 %build
 mvn-rpmbuild -e \
@@ -172,6 +173,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug  8 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-3
+- Fix FTBFS by adding ignoreOptionalProblems function
+- Use new pom_ macros instead of patches
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild