Index: hyperrogue-55/graph.cpp
===================================================================
--- hyperrogue-55/graph.cpp
+++ hyperrogue-55/graph.cpp	2015-03-09 12:15:12.579985504 +0100
@@ -3087,8 +3087,8 @@
     || loadMusicInfo("./hyperrogue-music.txt") 
     || loadMusicInfo("music/hyperrogue-music.txt")
 #ifdef FHS
-    || loadMusicInfo("/usr/share/hyperrogue/hyperrogue-music.txt") 
-    || loadMusicInfo(s0 + getenv("HOME") + "/.hyperrogue-music.txt")
+    || loadMusicInfo("/usr/share/games/hyperrogue/hyperrogue-music.txt") 
+    || loadMusicInfo(s0 + getenv("HOME") + "/.local/share/hyperrogue/hyperrogue-music.txt")
 #endif
     ;
 
Index: hyperrogue-55/hyper.cpp
===================================================================
--- hyperrogue-55/hyper.cpp
+++ hyperrogue-55/hyper.cpp	2015-03-09 12:15:21.178618606 +0100
@@ -90,10 +90,12 @@
   srand(time(NULL));
   
   #ifdef FHS
-  char sbuf[640], cbuf[640];
+  char dbuf[640], sbuf[640], cbuf[640];
   if(getenv("HOME")) {
-    snprintf(sbuf, 640, "%s/.%s", getenv("HOME"), scorefile); scorefile = sbuf;
-    snprintf(cbuf, 640, "%s/.%s", getenv("HOME"), conffile); conffile = cbuf;
+    const char *userDir = ".local/share/hyperrogue";
+    snprintf(dbuf, 640, "%s %s/%s", "mkdir -p", getenv("HOME"), userDir); system(dbuf);
+    snprintf(sbuf, 640, "%s/%s/%s", getenv("HOME"), userDir, scorefile); scorefile = sbuf;
+    snprintf(cbuf, 640, "%s/%s/%s", getenv("HOME"), userDir, conffile); conffile = cbuf;
     }
   #endif