diff --git a/Dockerfile b/Dockerfile
index 006e13ffec173250013c88e200decdd99fb80983..686d5f9ee168ef858293fee9fddb619cf03a3745 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ADD config.fish /etc/fish/
 ADD start.sh /usr/local/bin/.start
 ADD configIdea.sh /usr/local/bin/.configIdea
 ADD l3dComposer.php /usr/local/bin/.l3dComposer.php
-ADD ahoy.changelog.yml /usr/local/bin/.ahoy.changelog.yml
+ADD ahoy.changelog.yml /etc/ahoy/changelog.yml
 ADD run/scripts/info /usr/local/bin/l3d
 ADD run/scripts/version /usr/local/bin/version
 ADD run/scripts/l3dnewversion /usr/local/bin/l3dnewversion
diff --git a/start.sh b/start.sh
index a0d232bbcbafe76d098909c5e0e8ab5d49023b1e..7820c935f2f4ee454c8a1fef9606f796cf0b2e6a 100755
--- a/start.sh
+++ b/start.sh
@@ -193,11 +193,20 @@ function setupAhoy {
     echo "ahoyapi: v2" >.ahoy.yml
     echo "commands:" >>.ahoy.yml
   fi
+  if [[ ! -f .ahoy ]]; then
+    ln -s /etc/ahoy .ahoy
+  fi
+  if [[ -f .gitignore ]]; then
+    EXISTING=$(cat .gitignore | grep "^/.ahoy/$")
+    if [[ -z ${EXISTING} ]]; then
+      echo "/.ahoy/" >>.gitignore
+    fi
+  fi
   EXISTING=$(cat .ahoy.yml | grep "^  changelog:")
   if [[ -z ${EXISTING} ]]; then
     echo "  changelog:" >>.ahoy.yml
     echo "    imports:" >>.ahoy.yml
-    echo "      - /usr/local/bin/.ahoy.changelog.yml" >>.ahoy.yml
+    echo "      - ./.ahoy/changelog.yml" >>.ahoy.yml
     echo "    usage: Changelog tools." >>.ahoy.yml
   fi
 }