diff --git a/cf-serverd.service b/cf-serverd.service
index c112715..13d236c 100644
--- a/cf-serverd.service
+++ b/cf-serverd.service
@@ -3,6 +3,7 @@ Description=CFEngine Server Daemon
 After=syslog.target
 
 [Service]
+Type=forking
 ExecStart=/usr/sbin/cf-serverd
 
 [Install]
diff --git a/cfengine.changes b/cfengine.changes
index 0a26a99..602d28a 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 26 08:24:00 UTC 2014 - kkaempf@suse.com
+
+- Fix cf-serverd.service file, type is forking.
+
 -------------------------------------------------------------------
 Tue Mar 18 11:30:23 UTC 2014 - kkaempf@suse.com