diff --git a/Makefile.org b/Makefile.org
index 57a49fc58644221a29efe3672dbf307363e1272d..9642da8f6a82ce231cc94d77867034b26c41935b 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -241,7 +241,7 @@ libcrypto.so: libcrypto.a
 	fi
 libssl.so: libcrypto.so libssl.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		$(MAKE) SHLIBDIRS=ssl $(SHLIB_TARGET); \
+		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-L. -lcrypto' $(SHLIB_TARGET); \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 	fi
@@ -254,47 +254,44 @@ clean-shared:
 	done
 
 linux-shared:
-	libs=; for i in ${SHLIBDIRS}; do \
+	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 	rm -f lib$$i.so \
 		lib$$i.so.${SHLIB_MAJOR} \
 		lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 	( set -x; ${CC}  -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		-Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \
 		-Wl,--whole-archive lib$$i.a \
-		-Wl,--no-whole-archive -lc $$libs ) || exit 1; \
+		-Wl,--no-whole-archive $$libs -lc ) || exit 1; \
 	libs="$$libs -L. -l$$i"; \
 	( set -x; \
 		ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			lib$$i.so.${SHLIB_MAJOR}; \
 		ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so ); \
-	done;
+	done
 
 # This assumes that GNU utilities are *not* used
 true64-shared:
-	libs=; for i in ${SHLIBDIRS}; do \
+	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 	( set -x; ${CC}  -shared -no_archive -o lib$$i.so \
 		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
-		-all lib$$i.a -none -lc $$libs ) || exit 1; \
+		-all lib$$i.a -none $$libs -lc ) || exit 1; \
 	libs="$$libs -L. -l$$i"; \
-	done;
+	done
 
 # This assumes that GNU utilities are *not* used
 solaris-shared:
-	libs=; for i in ${SHLIBDIRS}; do \
+	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 	rm -f lib$$i.so \
 		lib$$i.so.${SHLIB_MAJOR} \
 		lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 	( set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		-h lib$$i.so.${SHLIB_MAJOR} \
-		-z allextract lib$$i.a $$libs ) || exit 1; \
+		-z allextract lib$$i.a $$libs -lc ) || exit 1; \
 	libs="$$libs -L. -l$$i"; \
 	ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		lib$$i.so.${SHLIB_MAJOR}; \
 	ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so; \
-	done; \
-	@set -x; \
-	for i in ${SHLIBDIRS}; do \
-	done;
+	done
 
 Makefile.ssl: Makefile.org
 	@echo "Makefile.ssl is older than Makefile.org."