diff --git a/Makefile b/Makefile
index c88ebeaec1fa6a641b278c739513c95128caf0df..5e496b3a100b0d60ad0fcc82aaaf87284f86342a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
+ifneq ($(findstring i686,$(TARGET)),)
+	CFLAGS += -m32
+else
+	CFLAGS += -m64
+endif
+
 default:
-	rm -f $(OUT_DIR)/bin_is_zero.o
-	$(CC) -O -shared native/bn_is_zero.c -o bn_is_zero.o
-	mv bn_is_zero.o $(OUT_DIR)
+	$(CC) $(CFLAGS) -c native/bn_is_zero.c -o $(OUT_DIR)/bn_is_zero.o
+	$(AR) crus $(OUT_DIR)/libwrapped.a $(OUT_DIR)/bn_is_zero.o
diff --git a/src/ffi.rs b/src/ffi.rs
index ec53df4bc0b4d0af7d2b7ce285f17feee9a4334b..fcd0d33e0062035299f7682559de5b370f30ced1 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -189,6 +189,12 @@ extern { }
 /* Since the openssl BN_is_zero is sometimes a macro, this wrapper is necessary. */
 pub unsafe fn BN_is_zero(a: *mut BIGNUM) -> c_int { bn_is_zero(a) }
 
+/* Special import from native/bn_is_zero.c */
+#[link(name="wrapped")]
+extern "C" {
+    pub fn bn_is_zero(a: *mut BIGNUM) -> c_int;
+}
+
 extern "C" {
     pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
     pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING;
@@ -241,9 +247,6 @@ extern "C" {
     pub fn BN_cmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int;
     pub fn BN_ucmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int;
 
-    /* Special import from native/bn_is_zero.c */
-    pub fn bn_is_zero(a: *mut BIGNUM) -> c_int;
-
     /* Prime handling */
     pub fn BN_generate_prime_ex(r: *mut BIGNUM, bits: c_int, safe: c_int, add: *mut BIGNUM, rem: *mut BIGNUM, cb: *const c_void) -> c_int;
     pub fn BN_is_prime_ex(p: *mut BIGNUM, checks: c_int, ctx: *mut BN_CTX, cb: *const c_void) -> c_int;
diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs
index 0e6edbf751d9a6e702e540df43ce78ae776fc1ba..50c24b94975e97f408eb9d487df5d6f89b7a9a00 100644
--- a/src/ssl/tests.rs
+++ b/src/ssl/tests.rs
@@ -221,3 +221,16 @@ fn test_cert_gen() {
     // FIXME: check data in result to be correct, needs implementation
     // of X509 getters
 }
+
+#[test]
+fn test_bn_is_zero() {
+    use ffi;
+    use std::ptr;
+
+    unsafe {
+        let bn = ffi::BN_new();
+        assert!(bn != ptr::null_mut());
+        // Just make sure it is linked and resolved correctly
+        ffi::BN_is_zero(bn);
+    }
+}