diff --git a/Dockerfile b/Dockerfile
index d6dd5e4..c9dc7af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Postgresql (http://www.postgresql.org/)
 
-FROM phusion/baseimage:0.9.13
+FROM phusion/baseimage:0.9.15
 MAINTAINER Ryan Seto <ryanseto@yak.net>
 
 # Ensure we create the cluster with UTF-8 locale
diff --git a/scripts/start.sh b/scripts/start.sh
index ccbabcb..bdf192a 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -27,4 +27,4 @@ wait_for_postgres_and_run_post_start_action &
 
 # Start PostgreSQL
 echo "Starting PostgreSQL..."
-setuser postgres /usr/lib/postgresql/9.3/bin/postgres -D /etc/postgresql/9.3/main
+exec setuser postgres /usr/lib/postgresql/9.3/bin/postgres -D /etc/postgresql/9.3/main