diff --git a/system/base/libunwind/actions.py b/system/base/libunwind/actions.py
index 9f89269e..6b11f28f 100644
--- a/system/base/libunwind/actions.py
+++ b/system/base/libunwind/actions.py
@@ -6,14 +6,31 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 
 def setup():
     pisitools.flags.add("-U_FORTIFY_SOURCE")
     autotools.autoreconf("-vfi")
-    autotools.configure("--enable-shared \
-                         --disable-static")
+    
+    options = "--enable-shared \
+               --disable-static \
+              "
+              
+    if get.buildTYPE() == "emul32":
+        shelltools.export("CC", "%s -m32" % get.CC())
+        shelltools.export("CXX", "%s -m32" % get.CXX())
+        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+        
+        options += "--build=i686-pc-linux-gnu \
+                    --host=i686-pc-linux-gnu \
+                    --prefix=/emul32 \
+                    --libdir=/usr/lib32 \
+                    --disable-documentation \
+                   " 
+    
+    autotools.configure(options)
     
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
@@ -27,6 +44,10 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    if get.buildTYPE() == "emul32":
+        pisitools.insinto("/usr/include", "include/libunwind-x86.h")
+        return
 
     # FIXME: Fedora removes it, Suse keeps it, breaks samba build, investigate further
     pisitools.remove("/usr/lib/libunwind*.a")
diff --git a/system/base/libunwind/pspec.xml b/system/base/libunwind/pspec.xml
index bfb8b476..12966c0b 100644
--- a/system/base/libunwind/pspec.xml
+++ b/system/base/libunwind/pspec.xml
@@ -42,8 +42,30 @@
             <Path fileType="library">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
-
+    <Package>
+        <Name>libunwind-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for libunwind</Summary>
+        <BuildType>emul32</BuildType>
+        <BuildDependencies>
+        </BuildDependencies>
+        <RuntimeDependencies>
+            <Dependency release="current">libunwind</Dependency>
+            <Dependency>xz-32bit</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+    
     <History>
+        <Update release="5">
+            <Date>2018-11-06</Date>
+            <Version>1.1</Version>
+            <Comment>Rebuild libunwind-32bit</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-07-15</Date>
             <Version>1.1</Version>