diff --git a/cifs-utils.changes b/cifs-utils.changes
index bdb820b..888ecf0 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 19 15:24:31 UTC 2014 - lmuelle@suse.com
+
+- Remove cifstab file; obsoleted by the more generic cifs credentials feature.
+
 -------------------------------------------------------------------
 Mon Jul 28 11:27:12 UTC 2014 - lmuelle@suse.com
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index e4bb52b..977da43 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -34,7 +34,6 @@ Source6:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
-Source4:        cifstab
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -149,7 +148,6 @@ mkdir -p \
 	${RPM_BUILD_ROOT}/%{_sbindir} \
 	${RPM_BUILD_ROOT}/%{_rundir}
 install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
-install -m 0600 -p ${RPM_SOURCE_DIR}/cifstab ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba/cifstab
 ln -s %{_sysconfdir}/init.d/${cifs_init_script} ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
 	${RPM_BUILD_ROOT}%{_rundir}/cifs
@@ -159,26 +157,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %fdupes ${RPM_BUILD_ROOT}
 %endif
 
-%pre
-# non SUSE + post-12.2, update, no cifstab, but smbfstab
-if [ ! 0%{?suse_version} -lt 1221 -a \
-	${1:-0} -gt 1 -a \
-	! -e /etc/samba/cifstab -a \
-	-f /etc/samba/smbfstab ]; then
-	cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
-	chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
-fi
-
 %post
-if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
-	test -f /etc/samba/cifstab && \
-		mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
-	mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab
-	if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then
-		chkconfig -a cifs >/dev/null
-		rm /var/adm/backup/etc_samba_smbfs-enabled
-	fi
-fi
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 exit 0
 
@@ -222,7 +201,6 @@ exit 0
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
 %attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/samba/cifstab
 %{_sbindir}/rccifs
 %dir %{_sysconfdir}/samba
 %ghost %{_rundir}/cifs