diff --git a/README.md b/README.md
index 867f3f25..2b50b578 100644
--- a/README.md
+++ b/README.md
@@ -382,6 +382,7 @@ docker run --name=gitlab -d --link postgresql:postgresql \
 The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container using the magic of docker links and works with the following images:
  - [sameersbn/postgresql](https://registry.hub.docker.com/u/sameersbn/postgresql/)
  - [orchardup/postgresql](https://registry.hub.docker.com/u/orchardup/postgresql/)
+ - [paintedfox/postgresql](https://registry.hub.docker.com/u/paintedfox/postgresql/)
 
 ## Redis
 
diff --git a/assets/init b/assets/init
index 788b8ce4..733a7c4f 100755
--- a/assets/init
+++ b/assets/init
@@ -142,6 +142,11 @@ elif [ -n "${POSTGRESQL_PORT_5432_TCP_ADDR}" ]; then
   DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}}
   DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}}
   DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}}
+
+  # support for linked paintedfox/postgresql image
+  DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}}
+  DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}}
 fi
 
 # set default user and database