diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 8fcd4f73be..b113850fba 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -45,73 +45,7 @@ crypto_portable.sym: crypto.sym  Makefile
 	-echo "generating crypto_portable.sym ..."
 	-cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym
 	-chmod u+w crypto_portable.sym
-if !HAVE_ARC4RANDOM_BUF
-	-echo arc4random >> crypto_portable.sym
-	-echo arc4random_buf >> crypto_portable.sym
-	-echo arc4random_uniform >> crypto_portable.sym
-if !HAVE_GETENTROPY
-	-echo getentropy >> crypto_portable.sym
-endif
-endif
-if !HAVE_ASPRINTF
-	-echo asprintf >> crypto_portable.sym
-	-echo vasprintf >> crypto_portable.sym
-endif
-if !HAVE_EXPLICIT_BZERO
-	-echo explicit_bzero >> crypto_portable.sym
-endif
-if !HAVE_FREEZERO
-	-echo freezero >> crypto_portable.sym
-endif
-if !HAVE_REALLOCARRAY
-	-echo reallocarray >> crypto_portable.sym
-endif
-if !HAVE_RECALLOCARRAY
-	-echo recallocarray >> crypto_portable.sym
-endif
-if !HAVE_STRLCAT
-	-echo strlcat >> crypto_portable.sym
-endif
-if !HAVE_STRLCPY
-	-echo strlcpy >> crypto_portable.sym
-endif
-if !HAVE_STRNDUP
-	-echo strndup >> crypto_portable.sym
-endif
-if !HAVE_STRNLEN
-	-echo strnlen >> crypto_portable.sym
-endif
-if !HAVE_STRSEP
-	-echo strsep >> crypto_portable.sym
-endif
-if !HAVE_STRTONUM
-	-echo strtonum >> crypto_portable.sym
-endif
-if !HAVE_TIMEGM
-	-echo timegm >> crypto_portable.sym
-endif
-if !HAVE_TIMINGSAFE_BCMP
-	-echo timingsafe_bcmp >> crypto_portable.sym
-endif
-if !HAVE_TIMINGSAFE_MEMCMP
-	-echo timingsafe_memcmp >> crypto_portable.sym
-endif
-if HOST_CPU_IS_INTEL
-	-echo OPENSSL_ia32cap_P >> crypto_portable.sym
-endif
 if HOST_WIN
-	-echo posix_perror >> crypto_portable.sym
-	-echo posix_fopen >> crypto_portable.sym
-	-echo posix_fgets >> crypto_portable.sym
-	-echo posix_open >> crypto_portable.sym
-	-echo posix_rename >> crypto_portable.sym
-	-echo posix_connect >> crypto_portable.sym
-	-echo posix_close >> crypto_portable.sym
-	-echo posix_read >> crypto_portable.sym
-	-echo posix_write >> crypto_portable.sym
-	-echo posix_getsockopt >> crypto_portable.sym
-	-echo posix_setsockopt >> crypto_portable.sym
-	-echo getuid >> crypto_portable.sym
 	-grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp
 	-mv crypto_portable.sym.tmp crypto_portable.sym
 endif
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index d27e2af835..002a26674a 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/Makefile.am.common
 
+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
+
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio
 
 noinst_LTLIBRARIES = libbs.la
@@ -34,6 +36,8 @@ remove_bs_objects: libssl.la
 libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS}
 libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
 libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
+libssl_la_LIBADD += $(libcompat_la_objects)
+libssl_la_LIBADD += $(libcompatnoopt_la_objects)
 libssl_la_LIBADD += libbs.la
 
 libbs_la_SOURCES = bs_ber.c