diff --git a/config/database.yml.example b/config/database.yml.example
index a0f82ac..c3678b9 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,15 +1,8 @@
-# Enable passwordless Postgres access with following commands:
-#
-# echo "local all $USER trust" | sudo tee -a /etc/postgresql/9.1/main/pg_hba.conf
-# sudo su - postgres -c "createuser -s -r -d $USER"
-
 development:
   adapter: postgresql
   encoding: unicode
   database: asciinema_development
   pool: 25
-  # username: asciiio
-  # password:
   min_messages: WARNING
 
 
@@ -21,8 +14,6 @@ test:
   encoding: unicode
   database: asciinema_test
   pool: 5
-  # username: asciiio
-  # password:
   min_messages: WARNING
 
 production:
@@ -30,5 +21,3 @@ production:
   encoding: unicode
   database: asciinema_production
   pool: 25
-  username: asciiio
-  password:
diff --git a/script/setup b/script/setup
index 5d9ba08..b4f3319 100755
--- a/script/setup
+++ b/script/setup
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-if [ ! -e /usr/local/lib/libtsm.a ];
-then
+apt-get install -y autoconf libtool pkg-config
+
+if [ ! -e /usr/local/lib/libtsm.a ]; then
   echo "libtsm missing, compiling from source..."
   DIR=$(mktemp -d -t tsmXXXXXX)
   cd $DIR
@@ -17,6 +18,10 @@ then
   cd -
 fi
 
+if [ ! -e config/database.yml ]; then
+  cp config/database.yml.example config/database.yml
+fi
+
 cd src && make && cd -
 
 rm -f log/*