diff --git a/bitlbee.changes b/bitlbee.changes
index 3320c7f..87bdc80 100644
--- a/bitlbee.changes
+++ b/bitlbee.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 23 18:45:03 UTC 2015 - lmuelle@suse.com
+
+- Let systemd start bitlbee in fork daemon mode by default.
+- Cleanup of the spec file, the init script, and the systemd configuration.
+
 -------------------------------------------------------------------
 Thu Apr 23 13:40:28 UTC 2015 - lmuelle@suse.com
 
diff --git a/bitlbee.init.d-suse.in b/bitlbee.init.d-suse.in
index 4aed976..4c0aa55 100644
--- a/bitlbee.init.d-suse.in
+++ b/bitlbee.init.d-suse.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 1995-2014 SUSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 1995-2015 SUSE Linux GmbH, Nuernberg, Germany.
 # All rights reserved.
 #
 # Author: Martin Caj <mcaj@suse.cz>
diff --git a/bitlbee.service-suse.in b/bitlbee.service-suse.in
index 05196b7..f718062 100644
--- a/bitlbee.service-suse.in
+++ b/bitlbee.service-suse.in
@@ -1,4 +1,4 @@
-# Copyright (c) 1995-2014 SUSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 1995-2015 SUSE Linux GmbH, Nuernberg, Germany.
 # All rights reserved.
 #
 # Author: Martin Caj <mcaj@suse.cz>
@@ -17,7 +17,7 @@ After=network.target
 Type=forking
 ExecStartPre=/usr/bin/mkdir -p /run/bitlbee
 ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee
-ExecStart=/usr/sbin/bitlbee -D -u bitlbee
+ExecStart=/usr/sbin/bitlbee -F -u bitlbee
 PIDFile=/run/bitlbee/bitlbee.pid
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
diff --git a/bitlbee.spec b/bitlbee.spec
index 824e3e6..afc5186 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bitlbee
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014-2015 SUSE Linux GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -24,7 +24,7 @@
 %define with_libotr 1
 %endif
 
-#define systemd for the new OpenSUSE only:
+#define systemd macro on post-12.3 systems only:
 %if 0%{?suse_version}  >= 1310
  %define with_systemd 1
 %else