diff --git a/0002-Revert-maint-Remove-puppetmaster.service.patch b/0002-Revert-maint-Remove-puppetmaster.service.patch
new file mode 100644
index 0000000..657f161
--- /dev/null
+++ b/0002-Revert-maint-Remove-puppetmaster.service.patch
@@ -0,0 +1,46 @@
+From f3d931b6c68e4305ce612949ec59dca460e578d7 Mon Sep 17 00:00:00 2001
+From: Gael Chamoulaud <gchamoul@redhat.com>
+Date: Wed, 29 Jul 2015 21:58:48 +0200
+Subject: [PATCH] Revert "(maint) Remove puppetmaster.service"
+
+This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5.
+---
+ ext/systemd/puppet.service       |  2 +-
+ ext/systemd/puppetmaster.service | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+ create mode 100644 ext/systemd/puppetmaster.service
+
+diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service
+index 61b0313..c7f063e 100644
+--- a/ext/systemd/puppet.service
++++ b/ext/systemd/puppet.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Puppet agent
+ Wants=basic.target
+-After=basic.target network.target
++After=basic.target network.target puppetmaster.service
+ 
+ [Service]
+ EnvironmentFile=-/etc/sysconfig/puppetagent
+diff --git a/ext/systemd/puppetmaster.service b/ext/systemd/puppetmaster.service
+new file mode 100644
+index 0000000..dbbd627
+--- /dev/null
++++ b/ext/systemd/puppetmaster.service
+@@ -0,0 +1,12 @@
++[Unit]
++Description=Puppet master
++Wants=basic.target
++After=basic.target network.target
++
++[Service]
++EnvironmentFile=-/etc/sysconfig/puppetmaster
++EnvironmentFile=-/etc/default/puppetmaster
++ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS --no-daemonize
++
++[Install]
++WantedBy=multi-user.target
+-- 
+2.4.3
+
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
deleted file mode 100644
index ee9abfd..0000000
--- a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
----
- lib/puppet/provider/service/systemd.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb
-index 39ef5ea..89b6b62 100644
---- a/lib/puppet/provider/service/systemd.rb
-+++ b/lib/puppet/provider/service/systemd.rb
-@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
- 
-   defaultfor :osfamily => [:archlinux]
-   defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7"
--  defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"]
-+  defaultfor :osfamily => :redhat, :operatingsystem => :fedora
-   defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"]
- 
-   def self.instances
--- 
-2.4.0
-
diff --git a/puppet.spec b/puppet.spec
index f3b288a..903e9f2 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -18,8 +18,8 @@
 %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
 
 Name:           puppet
-Version:        4.1.0
-Release:        4%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -31,8 +31,7 @@ Source4:        start-puppet-wrapper
 
 # Puppetlabs messed up with default paths
 Patch01:        0001-Fix-puppet-paths.patch
-# systemd is the default init for all supported Fedora releases
-Patch02:        0002-make-systemd-the-default-init-for-fedora-in-puppet.patch
+Patch02:        0002-Revert-maint-Remove-puppetmaster.service.patch
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,7 +119,7 @@ The server can also function as a certificate authority and file server.
 %prep
 %setup -q
 %patch01 -p1 -b .paths
-%patch02 -p1 -b .systemd
+%patch02 -p1 -b .server
 # Unbundle
 rm -r lib/puppet/vendor/*{pathspec,rgen}*
 echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb
@@ -389,6 +388,9 @@ exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul 29 2015 Gael Chamoulaud <gchamoul@redhat.com> - 4.2.1-1
+- Upstream 4.2.1
+
 * Tue Jul 28 2015 Lukas Zapletal <lzap+rpm@redhat.com> 4.1.0-4
 - 1246238 - systemd service type changed to 'simple'
 
diff --git a/sources b/sources
index 4058083..42c0eed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a5a553f9bbc9e9e136660c05b9be3265  puppet-4.1.0.tar.gz
-66f0287001548e7a2a98a25d03ad6ae9  puppet-4.1.0.tar.gz.asc
+ec058dd9ac38dce720a9248fea23a98b  puppet-4.2.1.tar.gz
+50a975fd929239e7df4f5df2e6b3931a  puppet-4.2.1.tar.gz.asc