diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch
index 140d635..d29aaef 100644
--- a/0001-Fix-puppet-paths.patch
+++ b/0001-Fix-puppet-paths.patch
@@ -1,4 +1,4 @@
-From ff5be0d65a5872cd809cee98a34521f335df9412 Mon Sep 17 00:00:00 2001
+From 92ec714fc77a5cc5c743367be39cd83afa2356b6 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar@redhat.com>
 Date: Wed, 29 Apr 2015 01:38:35 +0200
 Subject: [PATCH 1/2] Fix puppet paths
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Fix puppet paths
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
-index 453095c..bb576df 100644
+index 453095c..bcdde95 100644
 --- a/lib/puppet/util/run_mode.rb
 +++ b/lib/puppet/util/run_mode.rb
 @@ -72,23 +72,23 @@ module Puppet
@@ -26,7 +26,7 @@ index 453095c..bb576df 100644
  
        def var_dir
 -        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
-+        which_dir("/var/lib/puppet/cache", "~/.puppet/cache")
++        which_dir("/var/lib/puppet", "~/.puppet/cache")
        end
  
        def run_dir
@@ -41,5 +41,5 @@ index 453095c..bb576df 100644
      end
  
 -- 
-2.3.6
+2.4.0
 
diff --git a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch
index cde5a14..ee9abfd 100644
--- a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch
+++ b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch
@@ -1,4 +1,4 @@
-From 11c7b82c193d88f82cab8b285cebae5be1f3b2b5 Mon Sep 17 00:00:00 2001
+From 4e812abeb7b373c780a6ff46a5450b9d53d68e30 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar@fedoraproject.org>
 Date: Mon, 13 Apr 2015 14:25:11 +0200
 Subject: [PATCH 2/2] make systemd the default init for fedora in puppet
@@ -21,5 +21,5 @@ index 39ef5ea..89b6b62 100644
  
    def self.instances
 -- 
-2.3.6
+2.4.0
 
diff --git a/puppet.spec b/puppet.spec
index 8f8fda5..343f0d6 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -19,7 +19,7 @@
 
 Name:           puppet
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -199,9 +199,9 @@ install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent
 install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master
 install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca
 %if 0%{?_with_systemd}
-sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \
+sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-master|' \
   %{buildroot}%{_unitdir}/puppetmaster.service
-sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \
+sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-agent|' \
   %{buildroot}%{_unitdir}/puppet.service
 %endif
 
@@ -389,6 +389,9 @@ exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Sun May 17 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 4.0.0-2
+- Fix puppet paths and unit files (upstream #12185)
+
 * Tue Apr 28 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 4.0.0-1
 - Upstream 4.0.0