diff --git a/cf-execd.service b/cf-execd.service
index 9c77067..0336159 100644
--- a/cf-execd.service
+++ b/cf-execd.service
@@ -3,6 +3,7 @@ Description=CFEngine Execution Daemon
 After=syslog.target
 
 [Service]
+Type=forking
 ExecStart=/usr/sbin/cf-execd
 
 [Install]
diff --git a/cf-monitord.service b/cf-monitord.service
index 5d2670c..34db31b 100644
--- a/cf-monitord.service
+++ b/cf-monitord.service
@@ -3,6 +3,7 @@ Description=CFEngine Monitoring Daemon
 After=syslog.target
 
 [Service]
+Type=forking
 ExecStart=/usr/sbin/cf-monitord
 
 [Install]
diff --git a/cfengine.changes b/cfengine.changes
index 95fd356..bd02423 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -7,7 +7,7 @@ Wed Mar 26 16:08:16 UTC 2014 - kkaempf@suse.com
 -------------------------------------------------------------------
 Wed Mar 26 08:24:00 UTC 2014 - kkaempf@suse.com
 
-- Fix cf-serverd.service file, type is forking.
+- Fix all .service files, type is forking.
 
 -------------------------------------------------------------------
 Tue Mar 18 11:30:23 UTC 2014 - kkaempf@suse.com