diff --git a/util/crypt/gnutls/actions.py b/util/crypt/gnutls/actions.py
index 0f72abf3df..33560721a2 100644
--- a/util/crypt/gnutls/actions.py
+++ b/util/crypt/gnutls/actions.py
@@ -14,20 +14,20 @@ def setup():
                --disable-silent-rules \
                --disable-guile \
                --enable-heartbeat-support \
-               --with-zlib \
                --without-tpm \
-               --without-dane \
                --disable-valgrind-tests"
 
     if get.buildTYPE() == "emul32":
         options += " --disable-hardware-acceleration \
-                    --with-included-unistring \
+                     --libdir=/usr/lib32 \
+                     --bindir=/usr/emul32/bin \
+                     --with-included-unistring \
                      --enable-local-libopts \
                    "
 
     autotools.configure(options)
 
-    pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()
@@ -39,3 +39,9 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    if get.buildTYPE() == "emul32":
+        pisitools.removeDir("/usr/emul32")
+        return
+    pisitools.dodoc("AUTHORS*", "README*")
+        
diff --git a/util/crypt/gnutls/pspec.xml b/util/crypt/gnutls/pspec.xml
index 487cfb0a05..53eecd1a35 100644
--- a/util/crypt/gnutls/pspec.xml
+++ b/util/crypt/gnutls/pspec.xml
@@ -100,7 +100,7 @@
 
     <History>
         <Update release="8">
-            <Date>2018-07-31</Date>
+            <Date>2018-09-16</Date>
             <Version>3.6.2</Version>
             <Comment>Rebuild</Comment>
             <Name>Mustafa Cianasal</Name>