diff --git a/modoboa/core/management/commands/generate_postfix_maps.py b/modoboa/core/management/commands/generate_postfix_maps.py
index 8f8f11295..92cb87b18 100644
--- a/modoboa/core/management/commands/generate_postfix_maps.py
+++ b/modoboa/core/management/commands/generate_postfix_maps.py
@@ -99,6 +99,11 @@ query = {{ query|safe }}
             dbtype = "postgres"
         else:
             dbtype = "mysql"
+        dbhost = db_settings.get("HOST", "127.0.0.1")
+        dbport = db_settings.get("PORT", "")
+        if len(dbport):
+            dbhost += ':' + dbport
+
         commandline = "{} {}".format(
             os.path.basename(sys.argv[0]), " ".join(sys.argv[1:]))
         context = {
@@ -108,7 +113,7 @@ query = {{ query|safe }}
             "dbuser": db_settings["USER"],
             "dbpass": db_settings["PASSWORD"],
             "dbname": db_settings["NAME"],
-            "dbhost": db_settings.get("HOST", "127.0.0.1"),
+            "dbhost": dbhost
         }
         return context