diff --git a/gvfs.changes b/gvfs.changes
index 7b0650c..8de76c3 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 19 08:58:19 UTC 2016 - zaitor@opensuse.org
+
+- Split out samba backend in own subpackage, make samba removable.
+- Drop superfluous libsmbclient-devel BuildRequires as we already
+  have pkgconfig(smbclient) BuildRequires that covers it.
+
 -------------------------------------------------------------------
 Fri Feb 19 01:27:57 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index a482576..5a88839 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -48,7 +48,6 @@ BuildRequires:  libgdu-devel
 %endif
 BuildRequires:  libgphoto2-devel
 BuildRequires:  libimobiledevice-devel >= 1.1.5
-BuildRequires:  libsmbclient-devel
 BuildRequires:  libsoup-devel >= 2.34.0
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -94,6 +93,17 @@ Requires:       %{name} = %{version}
 %description backend-afc
 This package provides a gvfs backend that supports iPod / iPhone devices.
 
+%package backend-samba
+Summary:        VFS functionality for GLib -- Samba Support
+License:        LGPL-2.0+
+Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+Requires:       %{name}-backends = %{version}
+Supplements:    packageand(%{name}:%(rpm -q --qf "%%{name}" --whatprovides libsmbclient)
+
+%description backend-samba
+This package provides a gvfs backend that supports Samba.
+
 %package backends
 Summary:        VFS functionality for GLib
 License:        LGPL-2.0+ and GPL-3.0
@@ -213,6 +223,17 @@ rm -rf %{buildroot}
 %{_libexecdir}/%{name}/gvfsd-afc
 %{_datadir}/%{name}/mounts/afc.mount
 
+%files backend-samba
+%defattr(-, root, root)
+%{_libexecdir}/%{name}/gvfsd-smb
+%{_datadir}/%{name}/mounts/smb.mount
+%{_libexecdir}/%{name}/gvfsd-smb-browse
+%{_datadir}/%{name}/mounts/smb-browse.mount
+# GSettings schemas & conversion data
+# Those schemas are used gvfsd-smb
+%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+%{_datadir}/GConf/gsettings/gvfs-smb.convert
+
 %files backends
 %defattr(-, root, root)
 %if %{with_udisks2}
@@ -280,22 +301,16 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/mounts/recent.mount
 %{_libexecdir}/%{name}/gvfsd-sftp
 %{_datadir}/%{name}/mounts/sftp.mount
-%{_libexecdir}/%{name}/gvfsd-smb
-%{_datadir}/%{name}/mounts/smb.mount
-%{_libexecdir}/%{name}/gvfsd-smb-browse
-%{_datadir}/%{name}/mounts/smb-browse.mount
 # gvfsd-trash is GPLv3 because of trashlib.
 %{_libexecdir}/%{name}/gvfsd-trash
 %{_datadir}/%{name}/mounts/trash.mount
 # GSettings schemas & conversion data
-# Those schemas are used by gvfsd-network & gvfsd-smb
+# Those schemas are used by gvfsd-network
 %{_datadir}/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/gsettings
 %{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
-%{_datadir}/GConf/gsettings/gvfs-smb.convert
 
 %files devel
 %defattr(-, root, root)