diff --git a/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch b/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
new file mode 100644
index 0000000..fbd933a
--- /dev/null
+++ b/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
@@ -0,0 +1,43 @@
+From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Sat, 23 Feb 2013 16:39:23 +0100
+Subject: [PATCH] Switch detection of smbclient from header to pkgconfig
+
+---
+ configure.ac              | 5 +++--
+ modules/access/Modules.am | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 65377ac..6c634f2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1874,9 +1874,10 @@ dnl
+ AC_ARG_ENABLE(smb,
+   [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
+ if test "${enable_smb}" != "no"; then
+-  AC_CHECK_HEADERS(libsmbclient.h,
++  PKG_CHECK_MODULES(SMBCLIENT, smbclient,
+     [ VLC_ADD_PLUGIN([access_smb])
+-      VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
++      VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS])
++      VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])],
+     [ if test -n "${enable_smb}"; then
+         AC_MSG_ERROR([cannot find libsmbclient headers])
+      fi ])
+diff --git a/modules/access/Modules.am b/modules/access/Modules.am
+index ff6047e..c06c89b 100644
+--- a/modules/access/Modules.am
++++ b/modules/access/Modules.am
+@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
+ libsdp_plugin_la_DEPENDENCIES =
+ 
+ libaccess_smb_plugin_la_SOURCES = smb.c
+-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
++libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb)
+ libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+ if HAVE_WIN32
+ libaccess_smb_plugin_la_LIBADD += -lmpr
+-- 
+1.7.11.7
+
diff --git a/vlc.spec b/vlc.spec
index 699f8ac..8141923 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -31,13 +31,14 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	2.0.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
 Patch0:         vlc-2.0.2-xcb_discard.patch
 Patch1:         0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
+Patch2:         0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -231,6 +232,7 @@ touch -r config.h.in configure configure.ac
 }
 %endif
 %patch1 -p1 -b .FLAC13
+%patch2 -p1 -b .samba4
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -517,6 +519,9 @@ fi || :
 
 
 %changelog
+* Sat Feb 23 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.0.5-5
+- Fix samba4 detection rfbz#2659
+
 * Wed Jan 30 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.0.5-4
 - Add new live555 requires