diff --git a/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
index 0eea72d..a199597 100644
--- a/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
+++ b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
@@ -1,7 +1,7 @@
-From 9b45dfe3a03e70c1413b7a1a7ee88431a4fe7f4c Mon Sep 17 00:00:00 2001
+From 7b6fb236b78dadcee14e047e52a342556f210f39 Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb@redhat.com>
 Date: Thu, 10 Jul 2014 15:30:17 +0200
-Subject: [PATCH] [maven.req] XMvn sets resolvedVersion to UNKNOWN for
+Subject: [PATCH 1/2] [maven.req] XMvn sets resolvedVersion to UNKNOWN for
  unresolvable deps
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH] [maven.req] XMvn sets resolvedVersion to UNKNOWN for
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/depgenerators/maven.req b/depgenerators/maven.req
-index 2e99c1e..f7133d6 100755
+index f334079..a4efdad 100755
 --- a/depgenerators/maven.req
 +++ b/depgenerators/maven.req
-@@ -310,7 +310,7 @@ class TagBuilder(object):
+@@ -270,7 +270,7 @@ class TagBuilder(object):
  
          unknown_deps = self.check_deps(metadata)
          for dependency in metadata.get_required_artifacts():
diff --git a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
new file mode 100644
index 0000000..7a43d8c
--- /dev/null
+++ b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
@@ -0,0 +1,73 @@
+From 24a1fb2f2f38bb8fdb883e91f34b3f2ca26765a7 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 30 Oct 2014 15:20:20 +0100
+Subject: [PATCH 2/2] Use wrapper script to inject extra JVM arguments
+
+---
+ install                   |  1 +
+ java-utils/java-functions | 14 ++++++++++++--
+ java-utils/java-wrapper   |  8 ++++++++
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+ create mode 100644 java-utils/java-wrapper
+
+diff --git a/install b/install
+index 16216a7..023136b 100755
+--- a/install
++++ b/install
+@@ -122,6 +122,7 @@ inst_config etc/font.properties "${javaconfdir}"
+ inst_config target/java.conf "${javaconfdir}"
+ 
+ inst_data target/java-functions "${javadir}-utils"
++inst_exec java-utils/java-wrapper "${javadir}-utils"
+ inst_data java-utils/maven_depmap.py "${javadir}-utils"
+ inst_data java-utils/pom_editor.py "${javadir}-utils"
+ 
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index fcadb1c..c57640f 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -228,7 +228,12 @@ set_javacmd()
+ 	JAVACMD="${JAVA_HOME}/${cmd}"
+ 	if [ -x "${JAVACMD}" ]; then
+ 	    _log "Using configured JAVACMD: $JAVACMD"
+-	    JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}"
++	    if [ -n "${JAVACMD_OPTS}" ]; then
++		_log "Using java-wrapper with extra options: ${JAVACMD_OPTS}"
++		export _JP_JAVACMD="${JAVACMD}"
++		export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}"
++		JAVACMD="%{javadir}-utils/java-wrapper"
++	    fi
+ 	    return 0
+ 	fi
+     done
+@@ -236,7 +241,12 @@ set_javacmd()
+     JAVACMD=$(which java 2>/dev/null || :)
+     if [ -x "${JAVACMD}" ]; then
+ 	_log "Using JAVACMD from PATH: $JAVACMD"
+-	JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}"
++	if [ -n "${JAVACMD_OPTS}" ]; then
++	    _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}"
++	    export _JP_JAVACMD="${JAVACMD}"
++	    export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}"
++	    JAVACMD="%{javadir}-utils/java-wrapper"
++	fi
+ 	return 0
+     fi
+ 
+diff --git a/java-utils/java-wrapper b/java-utils/java-wrapper
+new file mode 100644
+index 0000000..29b3143
+--- /dev/null
++++ b/java-utils/java-wrapper
+@@ -0,0 +1,8 @@
++#!/bin/sh
++
++JAVACMD="${_JP_JAVACMD}"
++JAVACMD_OPTS="${_JP_JAVACMD_OPTS}"
++unset _JP_JAVACMD
++unset _JP_JAVACMD_OPTS
++
++exec "${JAVACMD}" ${JAVACMD_OPTS} "${@}"
+-- 
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 5b75975..1459dd2 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        4.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -9,6 +9,7 @@ URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
 Patch0:         0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
+Patch1:         0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch
 
 BuildArch:      noarch
 
@@ -134,6 +135,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %setup -q -n javapackages-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -174,6 +176,10 @@ popd
 %doc LICENSE
 
 %changelog
+* Thu Oct 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1.0-3
+- Use wrapper script to inject ABRT agent JVM argument
+- Resolves: rhbz#1153652
+
 * Thu Jul 10 2014 Michal Srb <msrb@redhat.com> - 4.1.0-2
 - Backport upstream patch for maven.req