diff --git a/repos/libports/lib/mk/arm/libcrypto.mk b/repos/libports/lib/mk/arm/libcrypto.mk
new file mode 100644
index 0000000000..8761c79ab5
--- /dev/null
+++ b/repos/libports/lib/mk/arm/libcrypto.mk
@@ -0,0 +1,6 @@
+# has to be the first path because it includes openssl/opensslconf.h
+INC_DIR += $(REP_DIR)/src/lib/openssl/arm
+
+CC_OPTS += -DL_ENDIAN
+
+include $(REP_DIR)/lib/mk/libcrypto.inc
diff --git a/repos/libports/lib/mk/libcrypto.mk b/repos/libports/lib/mk/libcrypto.inc
similarity index 95%
rename from repos/libports/lib/mk/libcrypto.mk
rename to repos/libports/lib/mk/libcrypto.inc
index 7c565b967f..305c199d88 100644
--- a/repos/libports/lib/mk/libcrypto.mk
+++ b/repos/libports/lib/mk/libcrypto.inc
@@ -188,22 +188,6 @@ INC_DIR += $(LIBCRYPTO_DIR)/evp
 INC_DIR += $(LIBCRYPTO_DIR)/modes
 INC_DIR += $(LIBCRYPTO_DIR)
 INC_DIR += $(LIBCRYPTO_DIR)/../
-
-CC_OPTS += -DL_ENDIAN
-
-ifeq ($(filter-out $(SPECS),x86_32),)
-TARGET_CPUARCH=x86_32
-else ifeq ($(filter-out $(SPECS),x86_64),)
-TARGET_CPUARCH=x86_64
-
-SRC_S += modexp512.s
-SRC_S += rc4_md5.s
-else ifeq ($(filter-out $(SPECS),arm),)
-TARGET_CPUARCH=arm
-endif
-
-INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
-INC_DIR += $(OPENSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
 INC_DIR += $(OPENSSL_PORT_DIR)/include
 
 
@@ -220,5 +204,4 @@ buildinf.h:
 	echo "  #define PLATFORM \"FreeBSD-$(TARGET_CPUARCH)\""; \
 	echo "#endif" ) > $@
 
-vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/$(TARGET_CPUARCH)
 vpath %.c $(LIBCRYPTO_DIR)
diff --git a/repos/libports/lib/mk/x86_32/libcrypto.mk b/repos/libports/lib/mk/x86_32/libcrypto.mk
new file mode 100644
index 0000000000..c69c9cc454
--- /dev/null
+++ b/repos/libports/lib/mk/x86_32/libcrypto.mk
@@ -0,0 +1,6 @@
+# has to be the first path because it includes openssl/opensslconf.h
+INC_DIR += $(REP_DIR)/src/lib/openssl/x86_32
+
+CC_OPTS += -DL_ENDIAN
+
+include $(REP_DIR)/lib/mk/libcrypto.inc
diff --git a/repos/libports/lib/mk/x86_64/libcrypto.mk b/repos/libports/lib/mk/x86_64/libcrypto.mk
new file mode 100644
index 0000000000..7ff388e049
--- /dev/null
+++ b/repos/libports/lib/mk/x86_64/libcrypto.mk
@@ -0,0 +1,11 @@
+# has to be the first path because it includes openssl/opensslconf.h
+INC_DIR += $(REP_DIR)/src/lib/openssl/x86_64
+
+CC_OPTS += -DL_ENDIAN
+
+SRC_S += modexp512.s
+SRC_S += rc4_md5.s
+
+vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/x86_64
+
+include $(REP_DIR)/lib/mk/libcrypto.inc