diff --git a/setup.py b/setup.py
index efb2831b3c..0fdaaebb31 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,8 @@
 
 setup(
     name=u'timesketch',
-    version=u'2015.12',
-    description=u'Collaborative forensic timeline analysis',
+    version=u'2016.7',
+    description=u'Digital forensic timeline analysis',
     long_description=timesketch_description,
     license=u'Apache License, Version 2.0',
     url=u'http://www.timesketch.org/',
diff --git a/timesketch.conf b/timesketch.conf
index 9049895571..17b55475a0 100644
--- a/timesketch.conf
+++ b/timesketch.conf
@@ -23,7 +23,11 @@ SECRET_KEY = u''
 # For more options, see the official documentation:
 # https://pythonhosted.org/Flask-SQLAlchemy/config.html
 # By default sqlite is used.
-SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
+#
+# NOTE: SQLite should only be used in development. Use PostgreSQL or MySQL in
+# production instead.
+#SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
+SQLALCHEMY_DATABASE_URI = 'postgresql://<USERNAME>:<PASSWORD>/timesketch'
 
 # Configure where your Elasticsearch server is located.
 #