diff --git a/server/samba/files/samba.pam b/server/samba/files/samba.pam
index 4a38cda46f..1266be0979 100644
--- a/server/samba/files/samba.pam
+++ b/server/samba/files/samba.pam
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
+password   required     pam_unix.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/server/samba/files/samba.pam.old b/server/samba/files/samba.pam.old
new file mode 100644
index 0000000000..4a38cda46f
--- /dev/null
+++ b/server/samba/files/samba.pam.old
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       required     pam_smbpass.so nodelay
+account    include      system-auth
+session    include      system-auth
+password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/server/samba/files/smb.conf b/server/samba/files/smb.conf
index 44625562f9..659d1ade15 100644
--- a/server/samba/files/smb.conf
+++ b/server/samba/files/smb.conf
@@ -1,7 +1,7 @@
 # PiSiLinux samba configuration 
 
 [global]
-workgroup = PiSiLinuxWorkGroup
+workgroup = PiSiWorkGroup
 server string = %h (workstation)
 log file = /var/log/samba/samba.log
 max log size = 50
diff --git a/server/samba/files/tmpfiles.conf b/server/samba/files/tmpfiles.conf
index 9b2806c0e0..d98ba64110 100644
--- a/server/samba/files/tmpfiles.conf
+++ b/server/samba/files/tmpfiles.conf
@@ -1 +1,2 @@
 D /run/samba 0755 root root
+d /var/log/samba 0755 root root
diff --git a/server/samba/files/tmpfiles.conf.old b/server/samba/files/tmpfiles.conf.old
new file mode 100644
index 0000000000..9b2806c0e0
--- /dev/null
+++ b/server/samba/files/tmpfiles.conf.old
@@ -0,0 +1 @@
+D /run/samba 0755 root root
diff --git a/server/samba/pspec.xml b/server/samba/pspec.xml
index e088af824c..f7ae00e2dd 100644
--- a/server/samba/pspec.xml
+++ b/server/samba/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>service</IsA>
         <Summary>A suite of SMB and CIFS client/server programs for UNIX</Summary>
         <Description>samba is a free software implementation of Microsoft's networking protocol released under the GNU General Public License. As of version 4, Samba not only provides file and print services for various Microsoft Windows clients but can also integrate with a Windows Server domain, either as a Primary Domain Controller (PDC) or as a Domain Member. It can also be part of an Active Directory domain.</Description>
-        <Archive sha1sum="be079ba13cffc9b421145ce6f4f711d2a128c365" type="targz">http://us1.samba.org/samba/ftp/stable/samba-4.7.5.tar.gz</Archive>
+        <Archive sha1sum="7f8e15709e03e52d14bd9c85dd717366c106993f" type="targz">http://us1.samba.org/samba/ftp/stable/samba-4.9.4.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>keyutils</Dependency>
             <Dependency>acl-devel</Dependency>
@@ -44,7 +44,14 @@
             <Dependency>libarchive-devel</Dependency>
             <Dependency>nss-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
-            <Dependency>libxslt</Dependency>
+            <Dependency>libxslt-devel</Dependency>
+            <Dependency>lmdb-devel</Dependency>
+            <Dependency>fuse-devel</Dependency>
+            <Dependency>dbus-devel</Dependency>
+            <Dependency>gpgme-devel</Dependency>
+            <Dependency>jansson-devel</Dependency>
+            <Dependency>libtirpc-devel</Dependency>
+            <Dependency>rpcsvc-proto-devel</Dependency>
             <Dependency versionFrom="1.2.12">libtdb-devel</Dependency>
             <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
         </BuildDependencies>
@@ -55,11 +62,15 @@
         <RuntimeDependencies>
             <Dependency>acl</Dependency>
             <Dependency>pam</Dependency>
+            <Dependency>dbus</Dependency>
+            <Dependency>lmdb</Dependency>
             <Dependency>attr</Dependency>
             <Dependency>popt</Dependency>
             <Dependency>zlib</Dependency>
+            <Dependency>gpgme</Dependency>
             <Dependency>libcap</Dependency>
-            <Dependency>python</Dependency>
+            <Dependency>jansson</Dependency>
+            <Dependency>libtirpc</Dependency>
             <Dependency>ncurses</Dependency>
             <Dependency>readline</Dependency>
             <Dependency>e2fsprogs</Dependency>
@@ -134,6 +145,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2019-04-05</Date>
+            <Version>4.9.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2018-08-06</Date>
             <Version>4.7.5</Version>