diff --git a/apps/apps.h b/apps/apps.h
index 51733d7e0..d2da5d196 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -113,7 +113,7 @@ extern BIO *bio_err;
 #define do_pipe_sig()
 #endif
 
-#if defined(MONOLITH)
+#if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup()	do_pipe_sig()
 #else
 #  if defined(MSDOS) || defined(WIN16) || defined(WIN32)
diff --git a/apps/openssl.c b/apps/openssl.c
index 6b48f22e9..748c6ce71 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -71,6 +71,7 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 #include "apps.h"
 #include "progs.h"
 #include "s_apps.h"