diff --git a/dba/create-database.sh b/dba/create-database.sh
index b1675c98..b3cd52a5 100755
--- a/dba/create-database.sh
+++ b/dba/create-database.sh
@@ -7,8 +7,16 @@ DBNAME="${1:-rscds}"
 
 DBADIR="`dirname \"$0\"`"
 
+# FIXME: Need to check that the database was actually created.
 createdb -E UTF8 "${DBNAME}"
 
+#
+# This will fail if the language already exists.
+# FIXME: test for the language first, perhaps.
+createlang plpgsql "${DBNAME}"
+
+#
+# FIXME: filter non-error output
 psql -f "${DBADIR}/rscds.sql" "${DBNAME}"
 
 psql -f "${DBADIR}/caldav_functions.sql" "${DBNAME}"