diff --git a/cifs-utils.changes b/cifs-utils.changes
index 463afc4..f04179d 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 20 21:30:43 UTC 2013 - lmuelle@suse.com
+
+- Restart or stop cifs service only if it is installed; (bnc#804822).
+
 -------------------------------------------------------------------
 Wed Jan 23 11:06:31 UTC 2013 - lmuelle@suse.com
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 9ac06a9..44a2fd1 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -114,6 +114,7 @@ install -m 644 -p contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfd
 %endif
 
 %preun
+if [ -x %{initdir}/cifs ]; then
 %if 0%{?suse_version}
 %{stop_on_removal cifs}
 %else
@@ -121,6 +122,7 @@ if [ $1 = 0 ] ; then
 	test -x /sbin/chkconfig && /sbin/chkconfig --del cifs
 fi
 %endif
+fi
 
 exit 0
 
@@ -129,6 +131,7 @@ exit 0
 exit 0
 
 %postun
+if [ -x %{initdir}/cifs ]; then
 %if 0%{?suse_version}
 %{restart_on_update cifs}
 %{insserv_cleanup}
@@ -137,6 +140,7 @@ if [ "$1" -ge "1" ]; then
 	%{initdir}/cifs restart >/dev/null
 fi	
 %endif
+fi
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 exit 0