diff --git a/.gitignore b/.gitignore
index 2f2795c8f..6c43468cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ doc/README.mdwn
 doc/TODO.mdwn
 doc/oneline.txt
 doc/plinth.1
-plinth.config
 TODO
 \#*
 .#*
diff --git a/plinth.sample.config b/plinth.config
similarity index 87%
rename from plinth.sample.config
rename to plinth.config
index 4a900b7c9..e13312dad 100644
--- a/plinth.sample.config
+++ b/plinth.config
@@ -8,16 +8,16 @@ file_root = %(root)s
 data_dir = %(file_root)s/data
 log_dir = %(data_dir)s
 pid_dir = %(data_dir)s
-python_root = %(file_root)s
 server_dir = plinth/
 actions_dir = %(file_root)s/actions
+doc_dir = %(file_root)s/doc
 
 # file locations
 store_file = %(data_dir)s/store.sqlite3
 user_db = %(data_dir)s/users.sqlite3
 status_log_file = %(log_dir)s/status.log
 access_log_file = %(log_dir)s/access.log
-pidfile = %(pid_dir)s/pidfile.pid
+pidfile = %(pid_dir)s/plinth.pid
 
 [Network]
 host = 127.0.0.1