diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 7adf56585a..b815e2293b 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -181,7 +181,6 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
-  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/network/samba/build b/packages/network/samba/build
index c909fb180b..79b79bce2f 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -22,8 +22,6 @@
 
 . config/options $1
 
-CFLAGS="$CFLAGS -fPIC -DPIC"
-
 cd $PKG_BUILD/source3
 
 sh autogen.sh
@@ -57,7 +55,7 @@ samba_cv_have_setresuid=yes \
             --with-piddir=/var/run \
             --enable-shared \
             --disable-static \
-            --disable-shared-libs \
+            --enable-shared-libs \
             --disable-debug \
             --with-libiconv="$SYSROOT_PREFIX/usr" \
             --disable-krb5developer \
@@ -117,17 +115,14 @@ samba_cv_have_setresuid=yes \
             --without-sqlite3 \
             --without-setproctitle \
 
-make bin/libtalloc.a
-make bin/libwbclient.a
-make bin/libtdb.a
-make bin/libsmbclient.a
+make bin/libsmbclient.so
 
 if [ "$SAMBA_SERVER" = "yes" ]; then
   make bin/samba_multicall
 fi
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
-  cp -P bin/*.a $SYSROOT_PREFIX/usr/lib
+  cp -P bin/*.so* $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/include
   cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
diff --git a/packages/network/samba/install b/packages/network/samba/install
index ca9d740cf9..5a175ed94f 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -22,6 +22,9 @@
 
 . config/options $1
 
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/source3/bin/*.so* $INSTALL/usr/lib
+
 if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/samba_multicall $INSTALL/usr/bin