diff --git a/Makefile b/Makefile
index 35086eb87..3afdbcfb0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+#SHELL := /bin/bash
 MAKE=make
 
 #TODO: add install target
@@ -8,7 +9,7 @@ COMPRESSED_CSS := $(patsubst %.css,%.tiny.css,$(CSS))
 PWD=`pwd`
 
 ## Catch-all tagets
-default: cherrypy.config dirs template css docs dbs
+default: cfg cherrypy.config dirs template css docs dbs
 all: default
 
 dbs: data/users.sqlite3
@@ -19,6 +20,9 @@ data/users.sqlite3: data/users.sqlite3.distrib
 dirs:
 	@mkdir -p data/cherrypy_sessions
 
+cfg: Makefile
+	test -f cfg.py || cp cfg.sample.py cfg.py
+
 cherrypy.config: Makefile
 	@echo [global]\\n\
 server.socket_host = \'0.0.0.0\'\\n\