diff --git a/docs/configuration.rst b/docs/configuration.rst
index d6bfb505..76a1fe5e 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -248,8 +248,7 @@ Database settings
The admin service stores configurations in a database.
- ``DB_FLAVOR``: the database type for mailu admin service. (``sqlite``, ``postgresql``, ``mysql``)
-- ``DB_HOST``: the database host for mailu admin service. (when not ``sqlite``)
-- ``DB_PORT``: the database port for mailu admin service. (when not ``sqlite``)
+- ``DB_HOST``: the database host for mailu admin service. For non-default ports use the notation `host:port`. (when not ``sqlite``)
- ``DB_PW``: the database password for mailu admin service. (when not ``sqlite``)
- ``DB_USER``: the database user for mailu admin service. (when not ``sqlite``)
- ``DB_NAME``: the database name for mailu admin service. (when not ``sqlite``)
@@ -257,8 +256,7 @@ The admin service stores configurations in a database.
The roundcube service stores configurations in a database.
- ``ROUNDCUBE_DB_FLAVOR``: the database type for roundcube service. (``sqlite``, ``postgresql``, ``mysql``)
-- ``ROUNDCUBE_DB_HOST``: the database host for roundcube service. (when not ``sqlite``)
-- ``ROUNDCUBE_DB_PORT``: the database port for roundcube service. (when not ``sqlite``)
+- ``ROUNDCUBE_DB_HOST``: the database host for roundcube service. For non-default ports use the notation `host:port`. (when not ``sqlite``)
- ``ROUNDCUBE_DB_PW``: the database password for roundcube service. (when not ``sqlite``)
- ``ROUNDCUBE_DB_USER``: the database user for roundcube service. (when not ``sqlite``)
- ``ROUNDCUBE_DB_NAME``: the database name for roundcube service. (when not ``sqlite``)
diff --git a/setup/templates/steps/database.html b/setup/templates/steps/database.html
index 82b6b0d2..03cb50b1 100644
--- a/setup/templates/steps/database.html
+++ b/setup/templates/steps/database.html
@@ -14,7 +14,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/towncrier/newsfragments/2073.bugfix b/towncrier/newsfragments/2073.bugfix
new file mode 100644
index 00000000..dd97c76b
--- /dev/null
+++ b/towncrier/newsfragments/2073.bugfix
@@ -0,0 +1 @@
+The DB_PORT and ROUNDCUBE_DB_PORT environment variables were not actually used. They are removed from the documentation. For using different ports you can already use the notation host:port .