diff --git a/nginx-mod-accesskey/default/PKGBUILD b/nginx-mod-accesskey/default/PKGBUILD
index d537f88a..258fb6dd 100644
--- a/nginx-mod-accesskey/default/PKGBUILD
+++ b/nginx-mod-accesskey/default/PKGBUILD
@@ -3,37 +3,33 @@
 
 pkgname=nginx-mod-accesskey
 pkgver=2.0.5
-pkgrel=5
+pkgrel=6
 _dirname="nginx-accesskey-$pkgver"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='Accesskey module for NGINX'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='https://github.com/Martchus/nginx-accesskey'
 license=('unknown')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/Martchus/nginx-accesskey/archive/v${pkgver}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            'f7cb363fb527dfda202009942ed3b1bb98e5ef9723893aa0beba22adf9b1a246')
+source=("$pkgname-$pkgver::https://github.com/Martchus/nginx-accesskey/archive/v${pkgver}.tar.gz")
+sha256sums=('f7cb363fb527dfda202009942ed3b1bb98e5ef9723893aa0beba22adf9b1a246')
 
 prepare() {
   cd "$srcdir/$_dirname"
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-cache-purge/default/PKGBUILD b/nginx-mod-cache-purge/default/PKGBUILD
index 82df7d64..1646bf7b 100644
--- a/nginx-mod-cache-purge/default/PKGBUILD
+++ b/nginx-mod-cache-purge/default/PKGBUILD
@@ -3,24 +3,19 @@
 
 pkgname=nginx-mod-cache-purge
 pkgver=2.3
-pkgrel=5
+pkgrel=6
 _dirname="ngx_cache_purge-${pkgver}"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='NGINX module that adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='http://labs.frickle.com/nginx_ngx_cache_purge'
 license=('CUSTOM')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::http://labs.frickle.com/files/${_dirname}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            '279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c')
+source=("$pkgname-$pkgver::http://labs.frickle.com/files/${_dirname}.tar.gz")
+sha256sums=('279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c')
 
 prepare() {
   cd "$srcdir/$_dirname"
@@ -34,14 +29,15 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-dav-ext/default/PKGBUILD b/nginx-mod-dav-ext/default/PKGBUILD
index f5139642..0dc1b7bb 100644
--- a/nginx-mod-dav-ext/default/PKGBUILD
+++ b/nginx-mod-dav-ext/default/PKGBUILD
@@ -3,38 +3,34 @@
 
 pkgname=nginx-mod-dav-ext
 pkgver=3.0.0
-pkgrel=3
+pkgrel=4
 _dirname="nginx-dav-ext-module-$pkgver"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='NGINX WebDAV missing commands support'
 arch=('x86_64')
 depends=("nginx=$_nginxver" 'libutil-linux' 'libxslt')
+makedepends=("nginx-src")
 url='https://github.com/arut/nginx-dav-ext-module'
 license=('BSD')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/arut/nginx-dav-ext-module/archive/v${pkgver}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            'd2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859')
+source=("$pkgname-$pkgver::https://github.com/arut/nginx-dav-ext-module/archive/v${pkgver}.tar.gz")
+sha256sums=('d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859')
 
 prepare() {
   cd "$srcdir/$_dirname"
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --with-http_dav_module --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-fancyindex/default/PKGBUILD b/nginx-mod-fancyindex/default/PKGBUILD
index 72edb28f..a50be5fb 100644
--- a/nginx-mod-fancyindex/default/PKGBUILD
+++ b/nginx-mod-fancyindex/default/PKGBUILD
@@ -3,38 +3,34 @@
 
 pkgname=nginx-mod-fancyindex
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 _dirname="ngx-fancyindex-${pkgver}"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='Fancy indexes module for the Nginx web server'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='https://github.com/aperezdc/ngx-fancyindex'
 license=('CUSTOM')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/aperezdc/ngx-fancyindex/archive/v${pkgver}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            '34e2bf332b9fa930914220c0187ca18d6f7a6abb88b81fdc9eb4779a1584f83a')
+source=("$pkgname-$pkgver::https://github.com/aperezdc/ngx-fancyindex/archive/v${pkgver}.tar.gz")
+sha256sums=('34e2bf332b9fa930914220c0187ca18d6f7a6abb88b81fdc9eb4779a1584f83a')
 
 prepare() {
   cd "$srcdir/$_dirname"
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-rtmp/default/PKGBUILD b/nginx-mod-rtmp/default/PKGBUILD
index 2998e9b9..ac263b46 100644
--- a/nginx-mod-rtmp/default/PKGBUILD
+++ b/nginx-mod-rtmp/default/PKGBUILD
@@ -3,38 +3,34 @@
 
 pkgname=nginx-mod-rtmp
 pkgver=1.2.1
-pkgrel=6
+pkgrel=7
 _dirname="nginx-rtmp-module-$pkgver"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='Module for nginx that adds RTMP support'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='https://github.com/arut/nginx-rtmp-module'
 license=('BSD')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/arut/nginx-rtmp-module/archive/v${pkgver}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            '87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37')
+source=("$pkgname-$pkgver::https://github.com/arut/nginx-rtmp-module/archive/v${pkgver}.tar.gz")
+sha256sums=('87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37')
 
 prepare() {
   cd "$srcdir/$_dirname"
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-slowfs-cache/default/PKGBUILD b/nginx-mod-slowfs-cache/default/PKGBUILD
index 9cd76e68..19e9eb44 100644
--- a/nginx-mod-slowfs-cache/default/PKGBUILD
+++ b/nginx-mod-slowfs-cache/default/PKGBUILD
@@ -3,24 +3,19 @@
 
 pkgname=nginx-mod-slowfs-cache
 pkgver=1.10
-pkgrel=5
+pkgrel=6
 _dirname="ngx_slowfs_cache-${pkgver}"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='NGINX module that adds ability to cache static files'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='http://labs.frickle.com/nginx_ngx_slowfs_cache'
 license=('CUSTOM')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::http://labs.frickle.com/files/${_dirname}.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            '1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1')
+source=("$pkgname-$pkgver::http://labs.frickle.com/files/${_dirname}.tar.gz")
+sha256sums=('1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1')
 
 prepare() {
   cd "$srcdir/$_dirname"
@@ -34,14 +29,15 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-substitutions-filter/default/PKGBUILD b/nginx-mod-substitutions-filter/default/PKGBUILD
index 630d1961..110fcad2 100644
--- a/nginx-mod-substitutions-filter/default/PKGBUILD
+++ b/nginx-mod-substitutions-filter/default/PKGBUILD
@@ -3,25 +3,19 @@
 
 pkgname=nginx-mod-substitutions-filter
 pkgver=0.6.4.110.b8a71ea
-pkgrel=1
+pkgrel=2
 _dirname="$pkgname"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='NGINX filter module which can do both regular expression and fixed string substitutions'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
-makedepends=('git')
+makedepends=("nginx-src" "git")
 url='https://github.com/yaoweibin/ngx_http_substitutions_filter_module'
 license=('BSD')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname::git+https://github.com/yaoweibin/ngx_http_substitutions_filter_module.git#commit=${pkgver##*.}"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            'SKIP')
+source=("$pkgname::git+https://github.com/yaoweibin/ngx_http_substitutions_filter_module.git#commit=${pkgver##*.}")
+sha256sums=('SKIP')
 
 prepare() {
   cd "$srcdir/$_dirname"
@@ -35,14 +29,15 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/README" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" # license is part of the README
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-upload-progress/default/PKGBUILD b/nginx-mod-upload-progress/default/PKGBUILD
index f9903b71..1477676b 100644
--- a/nginx-mod-upload-progress/default/PKGBUILD
+++ b/nginx-mod-upload-progress/default/PKGBUILD
@@ -3,25 +3,20 @@
 
 pkgname=nginx-mod-upload-progress
 pkgver=0.9.2
-pkgrel=5
+pkgrel=6
 _dirname="nginx-upload-progress-module-$pkgver"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='NGINX module implementing an upload progress system, that monitors RFC1867 POST uploads'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='https://github.com/masterzen/nginx-upload-progress-module'
 license=('CUSTOM')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/masterzen/nginx-upload-progress-module/archive/v${pkgver}.tar.gz"
-  '0001-Fix-ngx_module_type.patch::https://github.com/masterzen/nginx-upload-progress-module/commit/dd138546b16a01e9c09613d02211373baf1cac02.patch'
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            'b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497'
+source=("$pkgname-$pkgver::https://github.com/masterzen/nginx-upload-progress-module/archive/v${pkgver}.tar.gz"
+        '0001-Fix-ngx_module_type.patch::https://github.com/masterzen/nginx-upload-progress-module/commit/dd138546b16a01e9c09613d02211373baf1cac02.patch')
+sha256sums=('b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497'
             '4fdf5269aadce50cc8ab6f2ffed19df40db681b25c6a37fa660686aa07ff3a27')
 
 prepare() {
@@ -30,14 +25,15 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
   install -Dm755 "$srcdir/$_dirname/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done
diff --git a/nginx-mod-upstream-fair/default/PKGBUILD b/nginx-mod-upstream-fair/default/PKGBUILD
index dc29874a..0a822692 100644
--- a/nginx-mod-upstream-fair/default/PKGBUILD
+++ b/nginx-mod-upstream-fair/default/PKGBUILD
@@ -3,24 +3,19 @@
 
 pkgname=nginx-mod-upstream-fair
 pkgver=0.1.3
-pkgrel=5
+pkgrel=6
 _dirname="nginx-upstream-fair-$pkgver"
-_nginxver=1.16.1
+_nginxver=1.18.0
 
 pkgdesc='Fair load balancer module for nginx'
 arch=('x86_64')
 depends=("nginx=$_nginxver" "libutil-linux")
+makedepends=("nginx-src")
 url='https://github.com/itoffshore/nginx-upstream-fair'
 license=('unknown')
 
-source=(
-  https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-  "$pkgname-$pkgver::https://github.com/itoffshore/nginx-upstream-fair/archive/$pkgver.tar.gz"
-)
-validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-sha256sums=('f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b'
-            'SKIP'
-            '5545e2f2a27d008690a2c60b90c0bf8a997310930d93fca80ebd33dc308ac2fc')
+source=("$pkgname-$pkgver::https://github.com/itoffshore/nginx-upstream-fair/archive/$pkgver.tar.gz")
+sha256sums=('5545e2f2a27d008690a2c60b90c0bf8a997310930d93fca80ebd33dc308ac2fc')
 
 prepare() {
   cd "$srcdir/$_dirname"
@@ -34,13 +29,14 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"/nginx-$_nginxver
+  cp -r /usr/src/nginx .
+  cd "$srcdir"/nginx
   ./configure --with-compat --add-dynamic-module="../$_dirname"
   make modules
 }
 
 package() {
-  cd "$srcdir"/nginx-$_nginxver/objs
+  cd "$srcdir"/nginx/objs
   for mod in ngx_*.so; do
     install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
   done