diff --git a/README.md b/README.md
index 048a8c883a38cc217c1ac93a2724b475199dc150..84a11ea05287b0b48af83414e3c797671b2f0264 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ or start each component separately
 
 * [#gitlab IRC channel](http://www.freenode.net/) on Freenode is unofficial but offers a way to get in touch with other GitLab users who may be able to help you.
 
-* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthousiast Jonathan M. Hethey is unofficial but it offers a good overview.
+* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
 
 
 ### Getting in touch
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index fbb7380ac4746a04c4576b5e5b27516156732d74..9cf3aa5fe8599305c534ba433df6e20d9ba6bdcb 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -31,6 +31,8 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
 
 ### Here ends user configuration ###
 
+# Read configuration variable file if it is present
+test -f /etc/default/gitlab && . /etc/default/gitlab
 
 # Switch to the app_user if it is not he/she who is running the script.
 if [ "$USER" != "$app_user" ]; then