diff --git a/maven-invoker-MSHARED-278.patch b/maven-invoker-MSHARED-278.patch
new file mode 100644
index 0000000..ff23678
--- /dev/null
+++ b/maven-invoker-MSHARED-278.patch
@@ -0,0 +1,26 @@
+From fb1bfb61d31abcdfaac0256648f42257520ce3c9 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 13 Mar 2013 13:35:39 +0100
+Subject: [PATCH 1/2] Fix MSHARED-278
+
+See: http://jira.codehaus.org/browse/MSHARED-278
+---
+ .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+index f8a22a5..35ab16b 100644
+--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+@@ -542,7 +542,7 @@ public class MavenCommandLineBuilder
+                 if ( !mavenHome.isDirectory() )
+                 {
+                     File binDir = mavenHome.getParentFile();
+-                    if ( "bin".equals( binDir.getName() ) )
++                    if ( binDir != null && "bin".equals( binDir.getName() ) )
+                     {
+                         // ah, they specified the mvn
+                         // executable instead...
+-- 
+1.8.1.4
+
diff --git a/maven-invoker-MSHARED-279.patch b/maven-invoker-MSHARED-279.patch
new file mode 100644
index 0000000..e3e1eae
--- /dev/null
+++ b/maven-invoker-MSHARED-279.patch
@@ -0,0 +1,26 @@
+From 97b2ceb3544c035459341278d45cef2e44c21c7b Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 13 Mar 2013 13:36:26 +0100
+Subject: [PATCH 2/2] Fix MSHARED-279
+
+See: http://jira.codehaus.org/browse/MSHARED-279
+---
+ .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+index 35ab16b..082c988 100644
+--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+@@ -536,7 +536,7 @@ public class MavenCommandLineBuilder
+         if ( mavenHome == null )
+         {
+             String mavenHomeProperty = System.getProperty( "maven.home" );
+-            if ( mavenHomeProperty != null )
++            if ( StringUtils.isNotEmpty( mavenHomeProperty ) )
+             {
+                 mavenHome = new File( mavenHomeProperty );
+                 if ( !mavenHome.isDirectory() )
+-- 
+1.8.1.4
+
diff --git a/maven-invoker.spec b/maven-invoker.spec
index 8cbdf54..01e13da 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -1,10 +1,12 @@
 Name:           maven-invoker
 Version:        2.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fires a maven build in a clean environment
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-invoker/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Patch0:         %{name}-MSHARED-278.patch
+Patch1:         %{name}-MSHARED-279.patch
 
 BuildArch:      noarch
 
@@ -45,6 +47,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 mvn-rpmbuild package javadoc:aggregate -Dmaven.test.failure.ignore
@@ -76,6 +80,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Mar 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-6
+- Add patch for MSHARED-278, resolves rhbz#921068
+- Add patch for MSHARED-279, resolves rhbz#921067
+
 * Wed Feb 20 2013 Tomas Radej <tradej@redhat.com> - 2.1.1-5
 - Added B/R on maven-shared