diff --git a/CREDITS b/CREDITS
index 1b13a7ed..4134678f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -7,10 +7,10 @@ Sven-Hendrik Haase
 Jan Alexander Steffens
 
 # Patchers and other contributors
+Elis Axelsson
 Duane Bekaert
 Pablo Lezaeta
 Kyah Rindlisbacher
 James Ross-Gowan
 Louis Taylor
-Elis
 Jannis
diff --git a/ponysay b/ponysay
index 8c85356d..62036aee 100755
--- a/ponysay
+++ b/ponysay
@@ -2,13 +2,13 @@
 
 version=1.0
 SYSTEMPONIES="/usr/share/ponysay/ponies"
-HOMEPONIES="${HOME}/.ponysay/ponies"
+HOMEPONIES="${HOME}/.config/ponysay/ponies"
 pony="*"
 wrap=""
 
 if [ "$TERM" = "linux" ]; then
     SYSTEMPONIES="/usr/share/ponysay/ttyponies"
-    HOMEPONIES="${HOME}/.ponysay/ttyponies"
+    HOMEPONIES="${HOME}/.config/ponysay/ttyponies"
 fi
 
 cmd=cowsay
@@ -19,7 +19,7 @@ version() {
 }
 
 scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2`
-listcmd="$0list.pl"
+listcmd="ponysaylist.pl"
 
 haspq=1
 if [[ -f './pq4ps-list' ]]; then