diff --git a/alpine/Makefile.module-njs b/alpine/Makefile.module-njs
index 8072380..f0cc992 100644
--- a/alpine/Makefile.module-njs
+++ b/alpine/Makefile.module-njs
@@ -25,7 +25,7 @@
 export MODULE_ADD_CONTROL_TAGS_njs
 
 define MODULE_PREBUILD_njs
-	cd ../njs-$(NJS_VERSION) \&\& ./configure \&\& make njs
+	cd ../njs-$(NJS_VERSION) \&\& ./configure \&\& make njs \&\& mv build build-cli
 endef
 export MODULE_PREBUILD_njs
 
@@ -33,7 +33,7 @@
 	mkdir -p "$$pkgdir"/usr/share/doc/nginx$(MODULE_SUFFIX)-module-njs
 	install -m644 ../njs-$(NJS_VERSION)/CHANGES "$$pkgdir"/usr/share/doc/nginx$(MODULE_SUFFIX)-module-njs/
 	mkdir -p "$$pkgdir"/usr/bin
-	install -m755 -s ../njs-$(NJS_VERSION)/build/njs "$$pkgdir"/usr/bin/
+	install -m755 -s ../njs-$(NJS_VERSION)/build-cli/njs "$$pkgdir"/usr/bin/
 endef
 export MODULE_PREINSTALL_njs
 
diff --git a/debian/Makefile.module-njs b/debian/Makefile.module-njs
index 50fdaaa..61757fd 100644
--- a/debian/Makefile.module-njs
+++ b/debian/Makefile.module-njs
@@ -20,7 +20,7 @@
 MODULE_BUILD_DEPENDS_njs=,libedit-dev
 
 define MODULE_PREBUILD_njs
-	cd debian/extra/njs-$(NJS_VERSION) \&\& ./configure \&\& make njs
+	cd debian/extra/njs-$(NJS_VERSION) \&\& ./configure \&\& make njs \&\& mv build build-cli
 endef
 export MODULE_PREBUILD_njs
 
@@ -28,7 +28,7 @@
 	mkdir -p $$(INSTALLDIR)/usr/share/doc/nginx$(MODULE_SUFFIX)-module-njs
 	install -m644 $$(BUILDDIR_nginx)/extra/njs-$(NJS_VERSION)/CHANGES $$(INSTALLDIR)/usr/share/doc/nginx$(MODULE_SUFFIX)-module-njs/
 	mkdir -p $$(INSTALLDIR)/usr/bin
-	install -m755 $$(CURDIR)/debian/extra/njs-$(NJS_VERSION)/build/njs $$(INSTALLDIR)/usr/bin/
+	install -m755 $$(CURDIR)/debian/extra/njs-$(NJS_VERSION)/build-cli/njs $$(INSTALLDIR)/usr/bin/
 endef
 export MODULE_PREINSTALL_njs
 
diff --git a/rpm/SPECS/Makefile.module-njs b/rpm/SPECS/Makefile.module-njs
index 719dd7d..b33c778 100644
--- a/rpm/SPECS/Makefile.module-njs
+++ b/rpm/SPECS/Makefile.module-njs
@@ -23,7 +23,7 @@
 export MODULE_DEFINITIONS_njs
 
 define MODULE_PREBUILD_njs
-cd %{bdir}/njs-$(NJS_VERSION) \&\& ./configure \&\& make njs
+cd %{bdir}/njs-$(NJS_VERSION) \&\& ./configure \&\& make njs \&\& mv build build-cli
 endef
 export MODULE_PREBUILD_njs
 
@@ -31,7 +31,7 @@
 %{__install} -m644 %{bdir}/njs-$(NJS_VERSION)/CHANGES \
         $$RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 %{__mkdir} -p $$RPM_BUILD_ROOT%{_bindir}
-%{__install} -m755 %{bdir}/njs-$(NJS_VERSION)/build/njs \
+%{__install} -m755 %{bdir}/njs-$(NJS_VERSION)/build-cli/njs \
         $$RPM_BUILD_ROOT%{_bindir}/
 endef
 export MODULE_PREINSTALL_njs