diff --git a/desktop/kde/plasma/ksshaskpass/pspec.xml b/desktop/kde/plasma/ksshaskpass/pspec.xml
index 911c464734..d10640f991 100755
--- a/desktop/kde/plasma/ksshaskpass/pspec.xml
+++ b/desktop/kde/plasma/ksshaskpass/pspec.xml
@@ -10,40 +10,44 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>ssh-add helper that uses kwallet and kpassworddialog</Summary>
         <Description>ssh-add helper that uses kwallet and kpassworddialog</Description>
         <Archive sha1sum="066b6496fb1062157b133c88bf7a603a004a4f07" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>python3</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>	        
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kwallet-devel</Dependency>
+            <Dependency>libxslt</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>ksshaskpass</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-        <Dependency>libgcc</Dependency>    
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>kwallet</Dependency>	    
+            <Dependency>qt5-base</Dependency>
+            <Dependency>libgcc</Dependency>    
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kwallet</Dependency>	    
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="data">/etc</Path>
+            <Path fileType="data">/etc</Path>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
-	    <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
-	<AdditionalFiles>
+        <AdditionalFiles>
           <AdditionalFile owner="root" permission="755" target="/etc/profile.d/ksshaskpass.sh">ksshaskpass.sh</AdditionalFile>
         </AdditionalFiles>
     </Package>
diff --git a/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml b/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml
index b7998dd088..d3931855d9 100755
--- a/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml
+++ b/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml
@@ -10,17 +10,19 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	    <IsA>app:console</IsA>
-	    <IsA>app:gui</IsA>
+        <IsA>app:console</IsA>
+        <IsA>app:gui</IsA>
         <Summary>The KDE Plasma Workspace Components</Summary>
         <Description>The Polkit-KDE-Agent package contains a graphical Polkit authentication agent for the KDE Plasma Desktop.</Description>
         <Archive sha1sum="e7efeb652950a91ddb6b9e3fdb52aed715565ed0" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>python3</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>	        
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>knotifications-devel</Dependency>
+            <Dependency>polkit-qt-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
         <Patches>
         </Patches>
@@ -30,32 +32,26 @@
         <Name>polkit-kde-authentication-agent-1</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>kcrash</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>polkit-qt</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>kdbusaddons</Dependency>
-	    <Dependency>kiconthemes</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>knotifications</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>	    
+            <Dependency>libgcc</Dependency>
+            <Dependency>kcrash</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>polkit-qt</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>	    
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="config">/etc</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
-        <Replaces>
-          <Package>kde-workspace</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kde-workspace</Package>
-        </Conflicts>  
     </Package>
 
     <History>
diff --git a/hardware/misc/libmtp/pspec.xml b/hardware/misc/libmtp/pspec.xml
index e3f5b00710..1995f6629f 100644
--- a/hardware/misc/libmtp/pspec.xml
+++ b/hardware/misc/libmtp/pspec.xml
@@ -19,8 +19,6 @@
             <Dependency>libgcrypt-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <!--<Patch level="1">0001-Fixup-device-OS-descriptor-probe-code.patch</Patch>
-            <Patch level="1">0001-Fix-inverted-boolean-logic.patch</Patch>-->
         </Patches>
     </Source>
 
@@ -28,7 +26,7 @@
         <Name>libmtp</Name>
         <RuntimeDependencies>
             <Dependency>libusb</Dependency>
-	    <Dependency>libgcrypt</Dependency>
+            <Dependency>libgcrypt</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
diff --git a/network/misc/libssh/pspec.xml b/network/misc/libssh/pspec.xml
index 855c6b308a..cae7908801 100644
--- a/network/misc/libssh/pspec.xml
+++ b/network/misc/libssh/pspec.xml
@@ -12,12 +12,13 @@
         <IsA>library</IsA>
         <Summary>Full C library functions for manipulating a client-side SSH connection</Summary>
         <Description>libssh library was designed to be used by programmers needing a working SSH implementation by the mean of a library. The complete control of the client is made by the programmer. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote programs. With its Secure FTP implementation, you can play with remote files easily, without third-party programs others than libcrypto (from openssl).</Description>
-        <Archive sha1sum="4e79f902ae91456de56f5d6ca8dc94c452379749" type="tarxz">https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.6.4.tar.gz</Archive>
+        <Archive sha1sum="4e79f902ae91456de56f5d6ca8dc94c452379749" type="targz">https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.6.4.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
-	    <Dependency>graphviz</Dependency>
+	    <!--Dependency>graphviz</Dependency-->
 	    <Dependency>doxygen</Dependency>
+	    <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
diff --git a/server/samba/actions.py b/server/samba/actions.py
index 2cf450c12e..8152cd45d1 100644
--- a/server/samba/actions.py
+++ b/server/samba/actions.py
@@ -58,3 +58,6 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     pisitools.dosym("samba-4.0/libsmbclient.h", "/usr/include/libsmbclient.h")
+    
+    # remove unneeded files
+    pisitools.removeDir("/usr/share/ctdb-tests")
diff --git a/server/samba/pspec.xml b/server/samba/pspec.xml
index 9865d7ada0..233ed2a266 100644
--- a/server/samba/pspec.xml
+++ b/server/samba/pspec.xml
@@ -50,6 +50,18 @@
     <Package>
         <Name>samba</Name>
         <RuntimeDependencies>
+            <Dependency>acl</Dependency>
+            <Dependency>pam</Dependency>
+            <Dependency>attr</Dependency>
+            <Dependency>popt</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>libcap</Dependency>
+            <Dependency>python</Dependency>
+            <Dependency>ncurses</Dependency>
+            <Dependency>readline</Dependency>
+            <Dependency>e2fsprogs</Dependency>
+            <Dependency>libgcrypt</Dependency>
+	    <Dependency>libarchive</Dependency>
             <Dependency>cups</Dependency>
             <Dependency>avahi</Dependency>
             <Dependency>gdb</Dependency>
@@ -57,7 +69,6 @@
             <Dependency>gamin</Dependency-->
             <Dependency>gnutls</Dependency>
             <Dependency>libaio</Dependency>
-            <Dependency>libbsd</Dependency>
             <!--Dependency>libldb</Dependency-->
             <Dependency>keyutils</Dependency>
             <Dependency>iniparser</Dependency>
@@ -82,6 +93,7 @@
             <Path fileType="data">/usr/share/samba</Path>
             <Path fileType="data">/usr/share/perl5</Path>
             <Path fileType="data">/var/cache/samba</Path>
+	    <Path fileType="data">/var/run/ctdb</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="config">/usr/lib/tmpfiles.d/samba.conf</Path>
         </Files>