diff --git a/maas/files/pgpass b/maas/files/pgpass
index daca0c7..199e189 100644
--- a/maas/files/pgpass
+++ b/maas/files/pgpass
@@ -1,2 +1,2 @@
 {%- from "maas/map.jinja" import region with context %}
-{{ region.database.host }}:5432:{{ region.database.name }}:{{ region.database.username }}:{{ region.database.password }}
\ No newline at end of file
+{{ region.database.host }}:{% if region.database.port is defined %}{{ region.database.port }}{% else %}5432{% endif %}:{{ region.database.name }}:{{ region.database.username }}:{{ region.database.password }}
diff --git a/maas/files/regiond.conf b/maas/files/regiond.conf
index 8c2fb3d..5e82e6c 100644
--- a/maas/files/regiond.conf
+++ b/maas/files/regiond.conf
@@ -4,4 +4,9 @@
 database_name: {{ region.database.name }}
 database_pass: {{ region.database.password }}
 database_user: {{ region.database.username }}
+{% if region.database.port is defined %}
+database_port: {{ region.database.port }}
+{% else %}
+database_port: 5432
+{% endif %}
 maas_url: http://{{ region.bind.host }}:{{ region.bind.get('port','5240') }}/MAAS
diff --git a/metadata/service/region/single.yml b/metadata/service/region/single.yml
index 6700acc..54ac038 100644
--- a/metadata/service/region/single.yml
+++ b/metadata/service/region/single.yml
@@ -18,4 +18,5 @@
         name: maasdb
         password: password
         username: maas
+        port: 5432
       enabled: true
diff --git a/tests/pillar/maas_cluster.sls b/tests/pillar/maas_cluster.sls
index fedb491..ee179d4 100644
--- a/tests/pillar/maas_cluster.sls
+++ b/tests/pillar/maas_cluster.sls
@@ -54,5 +54,6 @@
       name: maasdb
       password: password
       username: maas
+      port: 5432
     enabled: true
     salt_master_ip: 127.0.0.1
diff --git a/tests/pillar/maas_region.sls b/tests/pillar/maas_region.sls
index d3325eb..668fc81 100644
--- a/tests/pillar/maas_region.sls
+++ b/tests/pillar/maas_region.sls
@@ -33,4 +33,5 @@
       name: maasdb
       password: password
       username: maas
+      port: 5432
     salt_master_ip: 127.0.0.1
diff --git a/tests/pillar/maas_storage.sls b/tests/pillar/maas_storage.sls
index e9a7405..1f3a35b 100644
--- a/tests/pillar/maas_storage.sls
+++ b/tests/pillar/maas_storage.sls
@@ -14,6 +14,7 @@
       name: maasdb
       password: password
       username: maas
+      port: 5432
     enabled: true
     salt_master_ip: 127.0.0.1
     machines: