diff --git a/Makefile.in b/Makefile.in
index 1f78712f..bacb8a0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 export RUSTC = rustc
 RUSTDOC = rustdoc
-export RUSTFLAGS = -O -Z extra-debug-info
+export RUSTFLAGS = -O -Z extra-debug-info --cfg ndebug
 BUILDDIR = build
 INSTALL_DIR = %PREFIX%
 
@@ -27,7 +27,7 @@ config.stamp: configure Makefile.in
 PHF_DIR = submodules/rust-phf
 PHF = $(foreach file,$(shell $(MAKE) -s -C $(PHF_DIR) print-targets),$(PHF_DIR)/$(file))
 OPENSSL_DIR = submodules/rust-openssl
-OPENSSL = $(OPENSSL_DIR)/$(shell $(MAKE) -s -C $(OPENSSL_DIR) print-target)
+OPENSSL = $(foreach file,$(shell $(MAKE) -s -C $(OPENSSL_DIR) print-target),$(OPENSSL_DIR)/$(file))
 
 $(PHF): config.stamp
 	$(MAKE) -C $(PHF_DIR)
@@ -41,13 +41,13 @@ $(OPENSSL): config.stamp
 # Main targets
 ###############################################################################
 POSTGRES_LIB_FILE = src/lib.rs
-POSTGRES_LIB = $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(POSTGRES_LIB_FILE))
+POSTGRES_LIB = $(foreach file,$(shell $(RUSTC) --crate-file-name $(POSTGRES_LIB_FILE)),$(BUILDDIR)/$(file))
 POSTGRES_TEST = $(BUILDDIR)/$(shell $(RUSTC) --test --crate-file-name $(POSTGRES_LIB_FILE))
 
 POSTGRES_LIB_DEPS = $(BUILDDIR)/postgres.d
 POSTGRES_TEST_DEPS = $(BUILDDIR)/postgres_test.d
 
-LINK_ARGS = -L $(dir $(OPENSSL)) $(foreach file,$(PHF),-L $(dir $(file)))
+LINK_ARGS = $(foreach file,$(OPENSSL),-L $(dir $(file))) $(foreach file,$(PHF),-L $(dir $(file)))
 
 -include $(POSTGRES_LIB_DEPS)
 -include $(POSTGRES_TEST_DEPS)
diff --git a/src/lib.rs b/src/lib.rs
index ac7ac43e..fb4dfe67 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -56,7 +56,8 @@ fn main() {
  */
 
 #[crate_id="github.com/sfackler/rust-postgres#postgres:0.0"];
-#[crate_type="lib"];
+#[crate_type="rlib"];
+#[crate_type="dylib"];
 #[doc(html_root_url="http://www.rust-ci.org/sfackler/rust-postgres/doc")];
 
 #[warn(missing_doc)];
diff --git a/submodules/rust-openssl b/submodules/rust-openssl
index 490e518c..360fa1f0 160000
--- a/submodules/rust-openssl
+++ b/submodules/rust-openssl
@@ -1 +1 @@
-Subproject commit 490e518c6d24cd5418bbe5a2b7b0dec9c0d0bef4
+Subproject commit 360fa1f04b575b2070f46611d9db3a852ab4a9d5