diff --git a/util/crypt/p11-kit/actions.py b/util/crypt/p11-kit/actions.py
index b5d24041f4..997aaae79a 100644
--- a/util/crypt/p11-kit/actions.py
+++ b/util/crypt/p11-kit/actions.py
@@ -7,16 +7,36 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 
 def setup():
-    autotools.configure("--with-module-path=/usr/lib%s/pkcs11" % ("32" if get.buildTYPE() == "emul32" else ""))
-
+    options = "--with-module-path=/usr/lib/pkcs11 \
+              "
+              
+    if get.buildTYPE() == "emul32":
+        options += "--sysconfdir=/usr/emul32/etc \
+                    --bindir=/usr/emul32/bin \
+                    --libdir=/usr/lib32 \
+                    --datadir=/usr/emul32/share \
+                    --with-module-path=/usr/lib32/pkcs11 \
+                    --libexecdir=/usr/emul32/libexec"
+        
+        shelltools.export("CC", "%s -m32" % get.CC())
+        shelltools.export("CXX", "%s -m32" % get.CXX())
+        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+                 
+                 
+    autotools.configure(options)
+ 
+      
 def build():
     autotools.make()
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    if get.buildTYPE() == "emul32": return
+    if get.buildTYPE() == "emul32":
+        pisitools.removeDir("/usr/emul32")
+        return
 
     pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README")
diff --git a/util/crypt/p11-kit/pspec.xml b/util/crypt/p11-kit/pspec.xml
index 31331161eb..9a93278a47 100644
--- a/util/crypt/p11-kit/pspec.xml
+++ b/util/crypt/p11-kit/pspec.xml
@@ -28,7 +28,7 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="executable">/usr/libexec</Path>
+            <Path fileType="executable">/usr/libexec/p11-kit</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="doc">/usr/share/gtk-doc</Path>
             <Path fileType="doc">/usr/share/p11-kit</Path>
@@ -71,9 +71,9 @@
 
     <History>
         <Update release="5">
-            <Date>2018-02-22</Date>
+            <Date>2018-02-28</Date>
             <Version>0.23.9</Version>
-            <Comment>Version Bump</Comment>
+            <Comment>Version Bump.</Comment>
             <Name>Pisi Linux Community</Name>
             <Email>admin@pisilinux.org</Email>
         </Update>