diff --git a/puppet.spec b/puppet.spec
index 4f3a9b4..4e92ca4 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -19,7 +19,7 @@
 
 Name:           puppet
 Version:        4.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -389,6 +389,9 @@ exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jul 21 2015 Lukas Zapletal <lzap+rpm@redhat.com> 4.1.0-3
+- Puppet agent is started via exec rather than sub-process
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/start-puppet-wrapper b/start-puppet-wrapper
index 4544dfd..e0c8b70 100644
--- a/start-puppet-wrapper
+++ b/start-puppet-wrapper
@@ -2,5 +2,7 @@
 #
 # This is wrapper script to start puppet which is used to support starting
 # puppet daemon processes with correct SELinux context.
+#
 
-/usr/bin/puppet $*
+# Call exec rather that spawn sub-process because of signals
+exec /usr/bin/puppet $*