diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 961c3b4..0f335a5 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -105,6 +105,9 @@ cp -a "%_sourcedir/conntrackd.README.SUSE" "%_sourcedir/conntrackd.conf" "$b/"
 
 %post -n conntrackd
 %fillup_only -n conntrackd
+if [ "$1" -eq 1 -a ! -e "%_sysconfdir/conntrackd/conntrackd.conf" ]; then
+	install -Dpm0644 "%_docdir/%name/conntrackd.conf" "%_sysconfdir/conntrackd/conntrackd.conf"
+fi
 %service_add_post conntrackd.service
 
 %preun  -n conntrackd
diff --git a/conntrackd.sysconfig b/conntrackd.sysconfig
index 9f3388b..5548fe4 100644
--- a/conntrackd.sysconfig
+++ b/conntrackd.sysconfig
@@ -1,6 +1,3 @@
-# The file can be copied to /etc/sysconfig/conntrackd to influence startup of
-# conntrackd on SUSE.
-
 ## Path:           Network/Conntrackd
 ## Description:    Basic Configuration of the connection tracking daemon 
 ## Default:        ""
@@ -9,7 +6,7 @@
 # If you want to start conntrackd with additional options (see
 # `man 8 conntrackd`), please add them here.
 #
-CONNTRACKD_OPTIONS="-C /dev/full"
+CONNTRACKD_OPTIONS=""
 
 ## Description:    The lock file of the running service
 ## Default:        '/var/run/lock/conntrackd.lock'
@@ -21,4 +18,4 @@ CONNTRACKD_OPTIONS="-C /dev/full"
 # As the daemon will not start if the lock file is left dangling, 
 # the sysvinit and systemd scripts will try to remove any left
 # over files first.
-#CONNTRACKD_LOCKFILE="/var/run/lock/conntrackd.lock"
+CONNTRACKD_LOCKFILE="/var/run/lock/conntrackd.lock"