diff --git a/README.md b/README.md
index 0ee3fbd..6dc4145 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ Look at the Tor manual with all [Configuration File Options](https://www.torproj
 
 For more detailed customisation copy `torrc` to the host and configure the desired settings:
 ```
+### /etc/tor/torrc ###
 # Port to advertise for incoming Tor connections.
 # common ports are 9001, 443
 ORPort 9001
@@ -199,7 +200,7 @@ docker-compose --version
 Please use the latest Docker engine available and do not use the engine that ships with your distros repository.
 
 ### License:
- - GPLv3 (c) 2018 Christian Wagner
+ - GPLv2 or later (c) 2018 Christian Wagner
 
 ### Guides
 
diff --git a/config/torrc b/config/torrc
index 1e06a5e..0f02012 100644
--- a/config/torrc
+++ b/config/torrc
@@ -1,4 +1,4 @@
-### /etc/torrc ###
+### /etc/tor/torrc ###
 # see /etc/torrc/torrc.default and https://www.torproject.org/docs/tor-manual.html.en
 
 # Server's public IP Address (usually automatic)
diff --git a/scripts/docker-entrypoint b/scripts/docker-entrypoint
index d8258b4..fc79acc 100755
--- a/scripts/docker-entrypoint
+++ b/scripts/docker-entrypoint
@@ -10,7 +10,7 @@ chmodd() {
 
 echo -e "\n========================================================"
 # If DataDirectory, torrc or secret_id_key is mounted here,
-# ownership needs to be changed to the debian-tor user
+# ownership needs to be changed to the debian-tor user 
 chown -Rv debian-tor:debian-tor /var/lib/tor
 # fix permissions
 chmodd 700 /var/lib/tor
@@ -40,7 +40,7 @@ if [ ! -e /tor-config-done ]; then
             echo -e "\nContactInfo ${CONTACT_EMAIL}" >> /etc/tor/torrc
         fi
     fi
-    
+
 fi
 
 echo -e "\n========================================================"
diff --git a/tests/config/torrc b/tests/config/torrc
index f7c6b64..8f6e002 100644
--- a/tests/config/torrc
+++ b/tests/config/torrc
@@ -1,4 +1,4 @@
-### /etc/torrc ###
+### /etc/tor/torrc ###
 ## This configuration is used for testing within Travis
 
 # Server's public IP Address (usually automatic)