diff --git a/system/base/openssl/actions.py b/system/base/openssl/actions.py
index c8c62844..889797d4 100644
--- a/system/base/openssl/actions.py
+++ b/system/base/openssl/actions.py
@@ -25,7 +25,12 @@ def setup():
         shelltools.export("CXX", "%s -m32" % get.CXX())
         shelltools.system("./Configure linux-elf %s" % options)
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
-
+        
+    elif get.ARCH() == "i686":
+         shelltools.system("./Configure linux-elf %s" % options)
+         pisitools.dosed("Makefile", "^(SHARED_LDFLAGS=).*", "\\1 ${LDFLAGS}")
+         pisitools.dosed("Makefile", "^(CFLAG=.*)", "\\1 ${CFLAGS}")
+         
     else:
         options += " enable-ec_nistp_64_gcc_128"
         shelltools.system("./Configure linux-x86_64 %s" % options)