diff --git a/maven-release-MNG-3954.patch b/maven-release-MNG-3954.patch
new file mode 100644
index 0000000..557111e
--- /dev/null
+++ b/maven-release-MNG-3954.patch
@@ -0,0 +1,12 @@
+--- maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java~	2011-07-28 15:42:12.000000000 +0200
++++ maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java	2015-11-27 08:41:43.677304909 +0100
+@@ -364,8 +364,7 @@
+ 
+         if ( releaseEnvironment.getSettings() != null )
+         {
+-            // FIXME: This is effectively useless in Maven 2.x, since getFile() always returns null
+-            File settingsFile = releaseEnvironment.getSettings().getRuntimeInfo().getFile();
++            File settingsFile = org.apache.maven.settings.RuntimeInfo.DEFAULT_USER_SETTINGS_FILE;
+             if ( settingsFile != null && settingsFile.isFile() )
+             {
+                 req.setUserSettingsFile( settingsFile );
diff --git a/maven-release.spec b/maven-release.spec
index 6e71127..b04f6a1 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -11,6 +11,8 @@ Patch2:         003-fixing-migration-to-component-metadata.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1015123
 Patch3:         %{name}-ftbfs.patch
+# Maven's Setting.getRuntimeInfo() was removed, see https://issues.apache.org/jira/browse/MNG-3954
+Patch4:         %{name}-MNG-3954.patch
 
 BuildArch:      noarch
 
@@ -25,7 +27,7 @@ BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  modello
 BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-utils
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  jaxen
 
@@ -64,6 +66,7 @@ This package contains the API documentation for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
 
 cat > README << EOT
 %{name}-%{version}
@@ -99,6 +102,10 @@ EOT
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Nov 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.1-14
+- Add patch for MNG-3954
+- Resolves: rhbz#1239670
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild