diff --git a/packages/network/samba/build b/packages/network/samba/build
index d9a85173aa..90c5828f71 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -11,9 +11,9 @@ else
   SMB_AVAHI="--disable-avahi"
 fi
 
-# samba fails to compile with GCC 4.5.0's link time optimization.
-  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
+# Fails to compile with GCC's link time optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
 
 export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
@@ -28,20 +28,28 @@ cd $PKG_BUILD/source3
             --with-privatedir=/var/run \
             --enable-shared \
             --disable-static \
-            --disable-pie \
+            --enable-debug \
+            --with-fhs \
+            --enable-pie \
+            --with-pthreads \
+            --with-sqlite3 \
+            --enable-relro \
+            --disable-swat \
             --disable-cups \
             $SMB_AVAHI \
             --without-pam \
             --without-ads \
-            --with-libtalloc \
-            --with-libtdb \
+            --without-libtalloc \
+            --without-libtdb \
             --without-libnetapi \
             --without-cifsmount \
             --without-ldap \
-            --without-winbind \
+            --with-winbind \
+            --with-dnsupdate \
+            --with-automount \
             --with-included-popt \
             --with-libsmbclient \
-            --without-ads \
+            --without-libsmbsharemodes \
             --without-quotas \
             --without-sys-quotas \
             --with-syslog \
@@ -51,8 +59,6 @@ make bin/libsmbclient.so \
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
   cp -PR bin/libsmbclient.so* $SYSROOT_PREFIX/usr/lib
-  cp -PR bin/libtalloc.so* $SYSROOT_PREFIX/usr/lib
-  cp -PR bin/libtdb.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/init.d/42_samba b/packages/network/samba/init.d/42_samba
index bb27b38980..7a279b0308 100755
--- a/packages/network/samba/init.d/42_samba
+++ b/packages/network/samba/init.d/42_samba
@@ -39,6 +39,8 @@
     SMB_ARG="$SMB_ARG --configfile=$SMB_DEFCONF"
   fi
 
+  mkdir -p /var/log/samba
+
   smbd $SMB_ARG > /dev/null 2>&1
 
 )&
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 25e89314b8..c322da60be 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -8,8 +8,7 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/source3/bin/libtalloc.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/source3/bin/libtdb.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/source3/bin/libwbclient.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/config
   cp -P $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config