diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
index ae808bb3e19132584bb9c6ab7aa259d48300f870..aec6e8e38b4407b6670bceeaade7aeae2f3e7c91 100644
--- a/debian/apport/source_nginx.py
+++ b/debian/apport/source_nginx.py
@@ -9,7 +9,7 @@ import os
 import subprocess
 
 def add_info(report, ui):
-    if (report['Package'].split()[0] != 'nginx'
+    if (report['Package'].split()[0] != 'nginx-common'
         and report['ProblemType'] == 'Package'
         and os.path.isdir('/run/systemd/system')):
         report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
diff --git a/debian/changelog b/debian/changelog
index c8f695b820c8b31779a404053900a6c09da7ce66..3bf98db4d4b0dba48f05ea37f406c262d9763156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+nginx (1.22.1-9) unstable; urgency=medium
+
+  * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)
+    (Closes: 1032929)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 16:19:32 +0100
+
+nginx (1.22.1-8) unstable; urgency=medium
+
+  * Main change:
+    Configuration files returned to nginx-common package. This fixes
+    the serious problem of losing configuration files during upgrade.
+    This is a rollback of a change made in 1.22.1-6 (Closes: 1032517)
+  * d/control: fix nginx-full dependencies
+  * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 06:53:32 +0100
+
 nginx (1.22.1-7) unstable; urgency=medium
 
   * nginx ABI release: nginx-abi-1.22.1-7
diff --git a/debian/control b/debian/control
index 6981083380b7045d166415869cece8cee496ad1c..7c37ce91388d9c44503dc09eb6ad83f95cd448b4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,10 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iproute2,
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Suggests: fcgiwrap, nginx-doc, ssl-cert
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
 Provides: httpd, httpd-cgi, ${nginx:abi}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -46,18 +47,19 @@ Description: small, powerful, scalable web/proxy server - documentation
  This package provides extra documentation to help unleash the power of Nginx.
 
 Package: nginx-common
+Breaks: nginx (<< 1.22.1-8)
+Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         nginx (<< ${source:Version}.1~),
-         nginx (>= ${source:Version}),
+Depends: ${misc:Depends}
+Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- From nginx version 1.22.1-6 changed to dependency metapackage,
- can be safely removed.
+ This package contains base configuration files used by all versions of
+ nginx.
 
 Package: nginx-dev
 Architecture: all
@@ -119,13 +121,13 @@ Description: nginx web/proxy server (standard version)
 
 Package: nginx-full
 Architecture: all
-Depends: libnginx-mod-http-auth-pam,
-         libnginx-mod-http-dav-ext,
-         libnginx-mod-http-echo,
-         libnginx-mod-http-geoip2,
-         libnginx-mod-http-subs-filter,
-         libnginx-mod-http-upstream-fair,
-         libnginx-mod-stream-geoip2,
+Depends: libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
+         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
+         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
+         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
+         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
+         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index cfe7b477c2d5a7775105d78e5c34180b348032a7..7cd29ebd9dc58b21c760048e81cb120b1148b590 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -15,7 +15,7 @@ libnginx-mod-http-echo:Version=1:0.63-4
 libnginx-mod-http-fancyindex:Version=1:0.5.2-3
 libnginx-mod-http-geoip2:Version=1:3.4-3
 libnginx-mod-http-headers-more-filter:Version=1:0.34-3
-libnginx-mod-http-lua:Version=1:0.10.23~rc2-2
+libnginx-mod-http-lua:Version=1:0.10.23-1
 libnginx-mod-http-subs-filter:Version=1:0.6.4-4
 libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
 libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index 9fef753c7f3231360459982e4dcb7be5f6ef1678..d36198384620406d7d661f2ba862701e90ec9ae6 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,13 +1,3 @@
-nginx-common (1.22.1-6) unstable; urgency=medium
-
-  The packages nginx-common deprecated.
-  Package no longer distribute the configuration files and is replaced
-  by a metapackage to keep upgrades smooth.
-  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
-  instead of these packages.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
-
 nginx-common (1.10.2-4) unstable; urgency=medium
 
   Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
diff --git a/debian/nginx.config b/debian/nginx-common.config
similarity index 100%
rename from debian/nginx.config
rename to debian/nginx-common.config
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
new file mode 100644
index 0000000000000000000000000000000000000000..8e5d7bf0f87a22d0c44d4fe8849c992c38efc02d
--- /dev/null
+++ b/debian/nginx-common.dirs
@@ -0,0 +1,12 @@
+etc/nginx
+etc/nginx/conf.d
+etc/nginx/modules-available
+etc/nginx/modules-enabled
+etc/nginx/sites-available
+etc/nginx/sites-enabled
+etc/ufw/applications.d
+usr/share/nginx
+usr/share/vim/addons
+usr/share/vim/registry
+var/lib/nginx
+var/log/nginx
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
new file mode 100644
index 0000000000000000000000000000000000000000..20109faa63726dbd7c9d33423e2c5c1f9c10b8b8
--- /dev/null
+++ b/debian/nginx-common.install
@@ -0,0 +1,6 @@
+contrib/vim/* usr/share/vim/addons
+debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
+debian/ufw/nginx etc/ufw/applications.d
+debian/vim/nginx.yaml usr/share/vim/registry
+html/index.html usr/share/nginx/html/
diff --git a/debian/nginx.links b/debian/nginx-common.links
similarity index 100%
rename from debian/nginx.links
rename to debian/nginx-common.links
diff --git a/debian/nginx.default b/debian/nginx-common.nginx.default
similarity index 100%
rename from debian/nginx.default
rename to debian/nginx-common.nginx.default
diff --git a/debian/nginx.init b/debian/nginx-common.nginx.init
similarity index 100%
rename from debian/nginx.init
rename to debian/nginx-common.nginx.init
diff --git a/debian/nginx.logrotate b/debian/nginx-common.nginx.logrotate
similarity index 100%
rename from debian/nginx.logrotate
rename to debian/nginx-common.nginx.logrotate
diff --git a/debian/nginx.service b/debian/nginx-common.nginx.service
similarity index 100%
rename from debian/nginx.service
rename to debian/nginx-common.nginx.service
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
new file mode 100644
index 0000000000000000000000000000000000000000..0d44608cda03d6f830ea8de0603c3321841b31cd
--- /dev/null
+++ b/debian/nginx-common.postinst
@@ -0,0 +1,59 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+  configure)
+    logdir="/var/log/nginx"
+
+    # Allow local admin to override
+    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
+      chown root:adm $logdir
+      chmod 0755 $logdir
+    fi
+
+    # Secure default logfiles on fresh installations
+    if [ -z "$2" ]; then
+      access_log="$logdir/access.log"
+      error_log="$logdir/error.log"
+
+      if [ ! -e "$access_log" ]; then
+        touch "$access_log"
+        chmod 640 "$access_log"
+        chown www-data:adm "$access_log"
+      fi
+
+      if [ ! -e "$error_log" ]; then
+        touch "$error_log"
+        chmod 640 "$error_log"
+        chown www-data:adm "$error_log"
+      fi
+    fi
+
+    # If a symlink doesn't exist and can be created, then create it.
+    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
+       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
+      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+    fi
+
+    # Create a default index page when not already present.
+    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
+      mkdir -p /var/www/html
+      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
+    fi
+
+    ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nginx.postrm b/debian/nginx-common.postrm
similarity index 100%
rename from debian/nginx.postrm
rename to debian/nginx-common.postrm
diff --git a/debian/nginx.preinst b/debian/nginx-common.preinst
similarity index 100%
rename from debian/nginx.preinst
rename to debian/nginx-common.preinst
diff --git a/debian/nginx.templates b/debian/nginx-common.templates
similarity index 100%
rename from debian/nginx.templates
rename to debian/nginx-common.templates
diff --git a/debian/nginx.dirs b/debian/nginx.dirs
index 69bccbc885dca88465b010602483363031b48f5e..236670a2d0f482de71df55c13f785fadb3cd13df 100644
--- a/debian/nginx.dirs
+++ b/debian/nginx.dirs
@@ -1,13 +1 @@
 usr/sbin
-etc/nginx
-etc/nginx/conf.d
-etc/nginx/modules-available
-etc/nginx/modules-enabled
-etc/nginx/sites-available
-etc/nginx/sites-enabled
-etc/ufw/applications.d
-usr/share/nginx
-usr/share/vim/addons
-usr/share/vim/registry
-var/lib/nginx
-var/log/nginx
diff --git a/debian/nginx.install b/debian/nginx.install
index 4a91b45828b31e639b9b7529723784f95faef7a4..f268f7f6c80920cc3e19636a263e344c98941791 100644
--- a/debian/nginx.install
+++ b/debian/nginx.install
@@ -1,7 +1 @@
 debian/build-bin/objs/nginx usr/sbin
-contrib/vim/* usr/share/vim/addons
-debian/conf/* etc/nginx
-debian/apport/source_nginx.py usr/share/apport/package-hooks
-debian/ufw/nginx etc/ufw/applications.d
-debian/vim/nginx.yaml usr/share/vim/registry
-html/index.html usr/share/nginx/html/
diff --git a/debian/nginx.postinst b/debian/nginx.postinst
index a86ac950434612516b085bacfaad42555c269ff3..888d9523c4cb55cffdf48aa2ce33717df444528c 100644
--- a/debian/nginx.postinst
+++ b/debian/nginx.postinst
@@ -1,49 +1,9 @@
 #!/bin/sh
 set -e
 
-. /usr/share/debconf/confmodule
-
 case "$1" in
-  configure)
-    logdir="/var/log/nginx"
-
-    # Allow local admin to override
-    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
-      chown root:adm $logdir
-      chmod 0755 $logdir
-    fi
-
-    # Secure default logfiles on fresh installations
-    if [ -z "$2" ]; then
-      access_log="$logdir/access.log"
-      error_log="$logdir/error.log"
-
-      if [ ! -e "$access_log" ]; then
-        touch "$access_log"
-        chmod 640 "$access_log"
-        chown www-data:adm "$access_log"
-      fi
-
-      if [ ! -e "$error_log" ]; then
-        touch "$error_log"
-        chmod 640 "$error_log"
-        chown www-data:adm "$error_log"
-      fi
-    fi
-
-    # If a symlink doesn't exist and can be created, then create it.
-    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
-       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
-      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
-    fi
-
-    # Create a default index page when not already present.
-    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
-      mkdir -p /var/www/html
-      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
-    fi
+  abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
   triggered)
     if invoke-rc.d --quiet nginx status >/dev/null; then
       echo "Triggering nginx reload ..."
@@ -51,10 +11,6 @@ case "$1" in
     fi
     exit 0
     ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index dab87b2f709984e01d9f081b546cda4113ab097c..dcbe15bd263a2f1aaf0d9fa109675ae3341cf88d 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] nginx.templates
+[type: gettext/rfc822deb] nginx-common.templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 35f306ad939eae4e836d1f6a70397bdb2ff370f3..d9ce72d76fd0c9ba16d8a409e484107a7bbf9421 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "És possible que els fitxers de registre nginx siguin insegurs"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/da.po b/debian/po/da.po
index a4864269485faf77ff38844100b58d30d5b8d74c..fcc511571ce51ea41ced33052787b2fe468afc7b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Nginx-logfilerne er muligvis usikre"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/de.po b/debian/po/de.po
index 7624322af358084d517e9a83d29b21e6100f54d4..d33bf66634dbbb4e4b190ed32a3d5c70cec47165 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Möglicherweise unsichere Nginx-Protokolldateien"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/es.po b/debian/po/es.po
index 6124eb45b300b9dcea555d527da888c349241e0c..552ab2fda556319229956c6b8d3f8e9ea58fc8de 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Posibles archivos de registro inseguros de nginx"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f9bfedfe17a213b63d127c6e338cd3da88c8c1d8..0a937cf6aa8138eef014aff79f043fc08a966161 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Certains fichiers de journaux semblent non sécurisés"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/it.po b/debian/po/it.po
index 30dc6690de270e4c016ed4354d9917a14950b953..245dc1bf3c15faa5fe9ca9dbb698e5951e09e9cc 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Documenti di log di nginx potenzialmente non sicuri"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 1cf7d0cd6df111984111dccdf7201e10200cf468..0fd1c5a55c54dcb3d35021949ad0d341cdf47772 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Wellicht onveilige nginx logbestanden"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 6870a721f509a3ca8eed6ace0f9be48c066e18e3..c552ab3dc7c61c8b6e6bce24952c49a99290176e 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Ficheiros de eventos (log) do nginx possivelmente inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index fe71d61ac5cdc988356cc1a3c50ef3393515b29b..92d3a6a9fcd5bc220924668cd5a0b02f046d2ba7 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Possíveis arquivos de log do nginx inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 23711ecc93b2770d8b33e8f279feebbf7bc916a7..fdaa7388f2dbe6b2e7b5905f6b399bb3332b4fe8 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Возможно небезопасные файлы журналов nginx"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 5090c4303c2bfb7fb8a5e437fe4a54a71caee86f..9260ff170457176352ce3d8bd67d31c610939fc5 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -33,13 +33,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index dfe0b4d6ebd74910e23e97ff6808643003ed2aa9..3e9d40b31e66615117bc728fc4d7445e78244f37 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Güvenliği sağlanmamış nginx günlük dosyaları olabilir"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/rules b/debian/rules
index 2932ef598bd038907f38a99c9376b7bf242048bb..da5f06e372727568d6af71c268c7e100882c8b95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,13 +95,13 @@ override_dh_install:
 	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/debhelper/dh_nginx --in-nginx-tree
 
 override_dh_installinit:
-	dh_installinit --package nginx --no-stop-on-upgrade --no-start --name=nginx
+	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
 
-#override_dh_installsystemd:
-#	dh_installsystemd --package nginx --name=nginx
-#
-#override_dh_installlogrotate:
-#	dh_installlogrotate --package nginx --name=nginx
+override_dh_installsystemd:
+	dh_installsystemd --name=nginx
+
+override_dh_installlogrotate:
+	dh_installlogrotate --package nginx-common --name=nginx
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Tdebian/substvars -Tdebian/libnginx-mod.abisubstvars