diff --git a/repos/libports/lib/mk/arm/libssl.mk b/repos/libports/lib/mk/arm/libssl.mk
new file mode 100644
index 000000000..4a02f72bb
--- /dev/null
+++ b/repos/libports/lib/mk/arm/libssl.mk
@@ -0,0 +1,4 @@
+include $(REP_DIR)/lib/mk/libssl.inc
+
+INC_DIR += $(REP_DIR)/src/lib/openssl/arm
+INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/arm
diff --git a/repos/libports/lib/mk/libssl.mk b/repos/libports/lib/mk/libssl.inc
similarity index 73%
rename from repos/libports/lib/mk/libssl.mk
rename to repos/libports/lib/mk/libssl.inc
index d4155a1b0..04d624700 100644
--- a/repos/libports/lib/mk/libssl.mk
+++ b/repos/libports/lib/mk/libssl.inc
@@ -15,17 +15,6 @@ SRC_C = s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
 
 INC_DIR += $(LIBSSL_PORT_DIR)/include/openssl
 INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/crypto
-
-ifeq ($(filter-out $(SPECS),x86_32),)
-TARGET_CPUARCH=x86_32
-else ifeq ($(filter-out $(SPECS),x86_64),)
-TARGET_CPUARCH=x86_64
-else ifeq ($(filter-out $(SPECS),arm),)
-TARGET_CPUARCH=arm
-endif
-
-INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
-INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
 INC_DIR += $(LIBSSL_PORT_DIR)/include
 
 vpath %.c $(LIBSSL_PORT_DIR)/src/lib/openssl/ssl
diff --git a/repos/libports/lib/mk/x86_32/libssl.mk b/repos/libports/lib/mk/x86_32/libssl.mk
new file mode 100644
index 000000000..f5bd7b680
--- /dev/null
+++ b/repos/libports/lib/mk/x86_32/libssl.mk
@@ -0,0 +1,4 @@
+include $(REP_DIR)/lib/mk/libssl.inc
+
+INC_DIR += $(REP_DIR)/src/lib/openssl/x86_32
+INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/x86_32
diff --git a/repos/libports/lib/mk/x86_64/libssl.mk b/repos/libports/lib/mk/x86_64/libssl.mk
new file mode 100644
index 000000000..789778635
--- /dev/null
+++ b/repos/libports/lib/mk/x86_64/libssl.mk
@@ -0,0 +1,4 @@
+include $(REP_DIR)/lib/mk/libssl.inc
+
+INC_DIR += $(REP_DIR)/src/lib/openssl/x86_64
+INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/x86_64