diff --git a/cifs-utils.changes b/cifs-utils.changes
index 92d8f44..9ea9036 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Dec 21 10:31:38 UTC 2011 - coolo@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+-------------------------------------------------------------------
+Thu Dec  1 16:04:20 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Sat Sep 17 22:58:13 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+-------------------------------------------------------------------
+Wed Jun 22 10:42:54 UTC 2011 - sjayaraman@suse.de
+
+- modify cifs init script to use /var/run instead of /var/lock/subsys for 
+  state file; (bnc#697218).
+
 -------------------------------------------------------------------
 Tue Mar  8 08:51:37 UTC 2011 - sjayaraman@suse.de
 
@@ -6,6 +27,11 @@ Tue Mar  8 08:51:37 UTC 2011 - sjayaraman@suse.de
   + mount.cifs: fix possible use of uninitialized variable.
   + mount.cifs: reacquire CAP_DAC_READ_SEARCH before calling mount(2).
   + mount.cifs: fix handling of scopeid in resolve_host.
+
+- Update to cifs-utils 4.8.1.
+  + fix mis-generated autoconf files.
+
+- Update to cifs-utils 4.8.
   + mount.cifs: manpage: add entry for "actimeo" option.
   + cifs-utils: rewrite hardcoded paths in manpages.
   + cifs-utils: fixes for manpage pathname replacement scheme.
@@ -19,6 +45,8 @@ Tue Mar  8 08:51:37 UTC 2011 - sjayaraman@suse.de
   + cifs.upcall: clean up key description decoding routine.
   + cifs.upcall: add keytab support for unattended mounts.
   + mount.cifs: add cruid= mount option.
+
+- Update to cifs-utils 4.7.
   + manpage: add mount.cifs manpage entry for "multiuser" option.
   + mount.cifs: reinstate ip= as an override for address resolution.
   + mount.cifs: use monotonic time for timeouts.
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 919be0d..66f009a 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -16,12 +16,11 @@
 #
 
 
-Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
-
 Name:           cifs-utils
 Version:        4.9
-Release:        1
-License:        GPLv3+
+Release:        0
+Summary:        Utilities for doing and managing mounts of the Linux CIFS filesyste
+License:        GPL-3.0+
 Group:          System/Filesystems
 Url:            http://www.samba.org/linux-cifs/cifs-utils/
 Source:         %{name}-%{version}.tar.bz2
@@ -34,10 +33,12 @@ PreReq:         insserv %{?fillup_prereq} mkinitrd
 PreReq:         /sbin/chkconfig
 %endif
 %define         initdir %{_sysconfdir}/init.d
-AutoReqProv:    on
 Provides:       cifs-mount = %{version}
 Obsoletes:      cifs-mount < %{version}
-BuildRequires:  krb5-devel libcap-devel libtalloc-devel
+BuildRequires:  automake
+BuildRequires:  krb5-devel
+BuildRequires:  libcap-devel
+BuildRequires:  libtalloc-devel
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
 %endif
@@ -55,7 +56,6 @@ the Linux CIFS filesystem.
 %setup -q
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 autoreconf --force --install
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %{configure}
diff --git a/cifs.init b/cifs.init
index 18d4144..266ab9f 100644
--- a/cifs.init
+++ b/cifs.init
@@ -45,7 +45,7 @@ rc_reset
 LC_ALL=en_US
 CIFSTAB="/etc/samba/cifstab"
 SMB_CONF="/etc/samba/smb.conf"
-CIFS_STATE_FILE="/var/lock/subsys/cifs"
+CIFS_STATE_FILE="/var/run/cifs"
 SLEEP=1
 TIMEOUT=10