diff --git a/programming/misc/libevent/actions.py b/programming/misc/libevent/actions.py
index 6ec44ad35d..a07aea8ac8 100644
--- a/programming/misc/libevent/actions.py
+++ b/programming/misc/libevent/actions.py
@@ -8,7 +8,7 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "libevent-%s-stable" % get.srcVERSION()
+#WorkDir = "libevent-%s-stable" % get.srcVERSION()
 
 def setup():
     pisitools.dosed("Makefile.am", "libevent_extra_la_LIBADD =", "libevent_extra_la_LIBADD = libevent.la ")
diff --git a/programming/misc/libevent/pspec.xml b/programming/misc/libevent/pspec.xml
index 77e2fcff9f..1b2227bef1 100644
--- a/programming/misc/libevent/pspec.xml
+++ b/programming/misc/libevent/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>A library to execute a function when a specific event occurs on a file descriptor</Summary>
         <Description>The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. libevent is meant to replace the asynchronous event loop found in event driven network servers. An application just needs to call event_dispatch() and can then add or remove events dynamically without having to change the event loop.</Description>
-        <Archive sha1sum="3e6674772eb77de24908c6267c698146420ab699" type="targz">https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz</Archive>
+        <Archive sha1sum="d8b93def5269877a89537bcdd9b44bac8ae69fc8" type="targz">https://github.com/libevent/libevent/archive/release-2.0.22-stable.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>openssl-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -20,7 +20,7 @@
         <Patches>
             <Patch level="0">libevent-linkage_fix.diff</Patch>
             <Patch level="1">libevent-2.0.13-manpages-on.patch</Patch>
-            <Patch level="1">libevent-2.0.21-stable-automake-fix.patch</Patch>
+            <!--Patch level="1">libevent-2.0.21-stable-automake-fix.patch</Patch-->
         </Patches>
     </Source>
 
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2015-07-30</Date>
+            <Version>2.0.22</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2014-05-31</Date>
             <Version>2.0.21</Version>
@@ -86,4 +93,4 @@
             <Email>admins@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>
diff --git a/programming/misc/libtevent/pspec.xml b/programming/misc/libtevent/pspec.xml
index 5cd5bcb2bd..84de6550b8 100644
--- a/programming/misc/libtevent/pspec.xml
+++ b/programming/misc/libtevent/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>Event system based on the talloc memory management library</Summary>
         <Description>libtevent is an event system based on the talloc memory management library. It is the core event system used in Samba. Tevent has support for many event types, including timers, signals, and the classic file descriptor events.</Description>
-        <Archive sha1sum="daa1a4f457773be2e0f645beede93db6943224a5" type="targz">http://samba.org/ftp/tevent/tevent-0.9.21.tar.gz</Archive>
+        <Archive sha1sum="80ed9a89e9d3ce1d70a44d36ddeaa507d9509af6" type="targz">http://samba.org/ftp/tevent/tevent-0.9.25.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>python-devel</Dependency>
             <Dependency>gdb-devel</Dependency>
@@ -47,6 +47,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2015-07-30</Date>
+            <Version>0.9.25</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2014-05-22</Date>
             <Version>0.9.21</Version>
diff --git a/server/database/libtdb/pspec.xml b/server/database/libtdb/pspec.xml
index 555dbb910d..687fd08ff5 100644
--- a/server/database/libtdb/pspec.xml
+++ b/server/database/libtdb/pspec.xml
@@ -13,12 +13,12 @@
         <IsA>app:console</IsA>
         <Summary>Trivial database library</Summary>
         <Description>libtdb contains C library and Python bindings to access to a trivial database. TDB is very much like GDBM and BSDDB except that it allows multiple simultaneous writers and uses locking internally to keep writers from trampling on each other.</Description>
-        <Archive sha1sum="98c4f80d7a1427406f71d6d47290ce61eb9328df" type="targz">http://www.samba.org/ftp/tdb/tdb-1.2.13.tar.gz</Archive>
+        <Archive sha1sum="417b67602501dd351fbfed08890cff8b72fbe38c" type="targz">http://www.samba.org/ftp/tdb/tdb-1.3.7.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>libxslt</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
-	    <Dependency>libbsd-devel</Dependency>
+            <Dependency>libbsd-devel</Dependency>
         </BuildDependencies>
         <Patches>
         </Patches>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2015-07-30</Date>
+            <Version>1.3.7</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2014-05-22</Date>
             <Version>1.2.13</Version>
diff --git a/server/samba/actions.py b/server/samba/actions.py
index 8152cd45d1..21e7ed754b 100644
--- a/server/samba/actions.py
+++ b/server/samba/actions.py
@@ -41,7 +41,6 @@ def setup():
                          --with-automount \
                          --with-cluster-support \
                          --with-dnsupdate \
-                         --with-dnsupdate \
                          --with-pam \
                          --with-pam_smbpass \
                          --with-quotas \
@@ -50,7 +49,9 @@ def setup():
                          --with-syslog \
                          --with-utmp \
                          --with-winbind \
+                         --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt \
                         " % MODULES)
+    # !ldb,!pyldb-util
 
 def build():
     shelltools.system("make")
diff --git a/server/samba/pspec.xml b/server/samba/pspec.xml
index 233ed2a266..f7dd0baaad 100644
--- a/server/samba/pspec.xml
+++ b/server/samba/pspec.xml
@@ -26,6 +26,7 @@
             <Dependency>readline-devel</Dependency>
             <Dependency>e2fsprogs-devel</Dependency>
             <Dependency>libgcrypt-devel</Dependency>
+            <Dependency>libbsd-devel</Dependency>
             <Dependency>avahi-libs</Dependency>
             <!--Dependency>ctdb-devel</Dependency-->
             <Dependency>cups-devel</Dependency>
@@ -40,8 +41,10 @@
             <Dependency>libtalloc-devel</Dependency>
             <Dependency>libtevent-devel</Dependency>
             <Dependency>openldap-client</Dependency>
-	    <Dependency>libarchive-devel</Dependency>
-            <Dependency>gdb-devel</Dependency>
+            <Dependency>libarchive-devel</Dependency>
+            <Dependency>nss-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>libxslt</Dependency>
             <Dependency versionFrom="1.2.12">libtdb-devel</Dependency>
             <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
         </BuildDependencies>
@@ -61,13 +64,14 @@
             <Dependency>readline</Dependency>
             <Dependency>e2fsprogs</Dependency>
             <Dependency>libgcrypt</Dependency>
-	    <Dependency>libarchive</Dependency>
+            <Dependency>libarchive</Dependency>
             <Dependency>cups</Dependency>
             <Dependency>avahi</Dependency>
             <Dependency>gdb</Dependency>
             <!--Dependency>dmapi</Dependency>
             <Dependency>gamin</Dependency-->
             <Dependency>gnutls</Dependency>
+            <Dependency>libbsd</Dependency>
             <Dependency>libaio</Dependency>
             <!--Dependency>libldb</Dependency-->
             <Dependency>keyutils</Dependency>
@@ -116,7 +120,7 @@
         <Name>samba-devel</Name>
         <Summary>Development files for samba</Summary>
         <RuntimeDependencies>
-            <Dependency>libldb-devel</Dependency>
+            <!--Dependency>libldb-devel</Dependency-->
             <Dependency>libtalloc-devel</Dependency>
             <Dependency>libtevent-devel</Dependency>
             <Dependency release="current">samba</Dependency>