diff --git a/src/bip_main.c b/src/bip_main.c
index 7558d7e..fabed51 100644
--- a/src/bip_main.c
+++ b/src/bip_main.c
@@ -340,6 +340,24 @@ int main(int argc, char **argv)
 
 		/* re-open to allow logfile rotate */
 		log_file_setup();
+
+#ifdef HAVE_LIBSSL
+		/*
+         * reload SSL context if server-side SSL is enabled and SSL files
+		 * seem accessible.
+         */
+		if (conf_css) {
+			if (check_ssl_files(SOFT_FAIL)) {
+				if (set_ssl_context(SSLCTX_FORCE_UPDATE) == 1)
+				    mylog(LOG_DEBUG, "SSL context has been updated");
+                else
+				    mylog(LOG_DEBUG, "SSL context has not been updated");
+            } else {
+				mylog(LOG_ERROR, "Unable to update SSL context, "
+								"file checks failed");
+            }
+		}
+#endif
 	}
 	return 1;
 }