diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 47ddb22eb209..ae8060fdd2f5 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1094,11 +1094,6 @@ pre-configure:
 	( cd ${WRKSRC_small_light} && ./setup )
 .endif
 
-post-configure:
-.if ${PORT_OPTIONS:MNJS}
-	( cd ${WRKSRC_njs} && ./${CONFIGURE_SCRIPT} && ${MAKE} )
-.endif
-
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
diff --git a/www/nginx-devel/files/patch-auto-make b/www/nginx-devel/files/patch-auto-make
new file mode 100644
index 000000000000..0281ddcac794
--- /dev/null
+++ b/www/nginx-devel/files/patch-auto-make
@@ -0,0 +1,15 @@
+--- auto/make	Thu Feb 25 16:28:42 2016 +0300
++++ auto/make	Thu Feb 25 15:22:05 2016 +0300
+@@ -437,9 +437,9 @@
+ 
+ # the addons config.make
+ 
+-if test -n "$NGX_ADDONS"; then
++if test -n "$NGX_ADDONS$DYNAMIC_ADDONS"; then
+ 
+-    for ngx_addon_dir in $NGX_ADDONS
++    for ngx_addon_dir in $NGX_ADDONS $DYNAMIC_ADDONS
+     do
+         if test -f $ngx_addon_dir/config.make; then
+             . $ngx_addon_dir/config.make
+