diff --git a/nginx/modsecurity/ngx_http_modsecurity.c b/nginx/modsecurity/ngx_http_modsecurity.c
index 297c14f8..19c7fa24 100644
--- a/nginx/modsecurity/ngx_http_modsecurity.c
+++ b/nginx/modsecurity/ngx_http_modsecurity.c
@@ -122,6 +122,7 @@ static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
 static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
 static ngx_http_upstream_t ngx_http_modsecurity_upstream;
+static ngx_uint_t          ngx_http_modsecurity_term = 0;
 
 static struct {
     char      *name;
@@ -950,9 +951,16 @@ ngx_http_modsecurity_init_process(ngx_cycle_t *cycle)
     return NGX_OK;
 }
 
+
 static void
 ngx_http_modsecurity_exit_process(ngx_cycle_t *cycle)
 {
+    /* ngx_single_process_cycle will call master and worker exit_process twice */
+	if (ngx_http_modsecurity_term) {
+		return;
+	}
+
+	ngx_http_modsecurity_term = 1;
     modsecTerminate();
 }
 
diff --git a/standalone/Makefile.in b/standalone/Makefile.in
index 73785d3c..996a0082 100644
--- a/standalone/Makefile.in
+++ b/standalone/Makefile.in
@@ -989,7 +989,7 @@ install-exec-hook: $(pkglib_LTLIBRARIES)
 	echo "CORE_MODULES=\"\$$CORE_MODULES ngx_pool_context_module\"" >> ../nginx/modsecurity/config; \
 	echo "HTTP_AUX_FILTER_MODULES=\"ngx_http_modsecurity \$$HTTP_AUX_FILTER_MODULES\"" >> ../nginx/modsecurity/config; \
 	echo "NGX_ADDON_SRCS=\"\$$NGX_ADDON_SRCS \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config;\
-	echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h\"" >> ../nginx/modsecurity/config; \
+	echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c \"" >> ../nginx/modsecurity/config; \
 	echo "CORE_LIBS=\"\$$CORE_LIBS \$$ngx_addon_dir/../../standalone/.libs/standalone.a $(standalone_LIBS) \"" >> ../nginx/modsecurity/config; \
 	echo "CORE_INCS=\"\$$CORE_INCS \$$ngx_addon_dir \$$ngx_addon_dir/../../standalone \$$ngx_addon_dir/../../apache2 $(standalone_INCS)\"" >> ../nginx/modsecurity/config; \
 	echo "Removing unused static libraries..."; \