diff --git a/README.md b/README.md
index 57b8b727..a0dbe3dc 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,14 @@ Below are some example configurations that you can use as reference:
 
 ```
 # to use postgres
-[datasource]
+[database]
 driver="postgres"
-source="host=172.17.0.2 user=postgres dbname=drone sslmode=disable"
+datasource="host=172.17.0.2 user=postgres dbname=drone sslmode=disable"
 
 # to use mysql
-[datasource]
+[database]
 driver="mysql"
-source="root@tcp(172.17.0.2:3306)/drone"
+datasource="root@tcp(172.17.0.2:3306)/drone"
 
 ```
 
@@ -63,7 +63,7 @@ cert=""
 
 [database]
 driver=""
-source=""
+datasource=""
 
 [registration]
 open=true
@@ -112,7 +112,7 @@ export DRONE_SERVER_SSL_CERT=""
 
 # custom database settings
 export DRONE_DATABASE_DRIVER=""
-export DRONE_DATABASE_SOURCE=""
+export DRONE_DATABASE_DATASOURCE=""
 
 # enable users to self-register
 export DRONE_REGISTRATION_OPEN=false
diff --git a/debian/drone/etc/drone/drone.toml b/debian/drone/etc/drone/drone.toml
index a5628cf6..f7ab89a3 100644
--- a/debian/drone/etc/drone/drone.toml
+++ b/debian/drone/etc/drone/drone.toml
@@ -18,7 +18,7 @@ port=":80"
 
 [database]
 driver="sqlite3"
-source="/var/lib/drone/drone.sqlite"
+datasource="/var/lib/drone/drone.sqlite"
 
 
 #####################################################################
diff --git a/server/main.go b/server/main.go
index c4ab4ac0..2fb4115a 100644
--- a/server/main.go
+++ b/server/main.go
@@ -42,7 +42,7 @@ var (
 var (
 	// Database driver configuration. Defaults to sqlite
 	// when no database configuration specified.
-	datasource = config.String("database-source", "drone.sqlite")
+	datasource = config.String("database-datasource", "drone.sqlite")
 	driver     = config.String("database-driver", "sqlite3")
 
 	// HTTP Server settings.