diff --git a/config/sounds.cfg b/config/sounds.cfg
index 533ca800..24e9a329 100755
--- a/config/sounds.cfg
+++ b/config/sounds.cfg
@@ -110,10 +110,10 @@ registersound "voicecom/thanks_2"               // 96 : public
 registersound "voicecom/awesome_1"              // 97 : public
 registersound "voicecom/awesome_2"              // 98 : public
 
-                        // Music
-registermusic "pingpong/03-pp-kamikadze"        // M_FLAGGRAB
-registermusic "pingpong/08-pp-headshot"         // M_LASTMINUTE1
-registermusic "ac"                              // M_LASTMINUTE2
+						// Music
+registermusic "pingpong/Ping_Pong_-_Kamikadze"	// M_FLAGGRAB
+registermusic "pingpong/Ping_Pong_-_Headshot"	// M_LASTMINUTE1
+registermusic "ac"				// M_LASTMINUTE2
 
 preload_music = [ loop m 3 [ musicpreload $m ] ]
 // uncomment the line below if you want to preload the music (if you experience delay e.g. when picking up a flag)
diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt
index d9b34bfd..07462449 100644
--- a/docs/package_copyrights.txt
+++ b/docs/package_copyrights.txt
@@ -228,16 +228,15 @@ http://www.gnu.org/licenses/gpl-2.0.txt
 
 ------------MUSIC---------------------
 
-..packages/audio/songs/ac.ogg
+../packages/audio/songs/ac.ogg
 
 End-of-match music: © 2005 Dietmar Pier, created for AssaultCube, all rights reserved.
  - cube.dietmarpier.de
 _____________________________________________________________________________________________________________
 
-..packages/audio/songs/pingpong/
+../packages/audio/songs/pingpong/
 
-PingPong: These tracks are by Lukas Zapletal & Ludek Horacek (pingpong)
-http://tanecni-olomouc.cz/ping-pong/
+Please read ../packages/audio/songs/pingpong/license.txt for more information.
 
 
 ------------OTHER LICENSES------------
diff --git a/packages/audio/songs/pingpong/03-pp-kamikadze.ogg b/packages/audio/songs/pingpong/03-pp-kamikadze.ogg
deleted file mode 100644
index 61f9dd24..00000000
Binary files a/packages/audio/songs/pingpong/03-pp-kamikadze.ogg and /dev/null differ
diff --git a/packages/audio/songs/pingpong/08-pp-headshot.ogg b/packages/audio/songs/pingpong/Ping_Pong_-_Headshot.ogg
similarity index 99%
rename from packages/audio/songs/pingpong/08-pp-headshot.ogg
rename to packages/audio/songs/pingpong/Ping_Pong_-_Headshot.ogg
index d1a0c393..fbea7c56 100644
Binary files a/packages/audio/songs/pingpong/08-pp-headshot.ogg and b/packages/audio/songs/pingpong/Ping_Pong_-_Headshot.ogg differ
diff --git a/packages/audio/songs/pingpong/Ping_Pong_-_Kamikadze.ogg b/packages/audio/songs/pingpong/Ping_Pong_-_Kamikadze.ogg
new file mode 100644
index 00000000..77f4b75a
Binary files /dev/null and b/packages/audio/songs/pingpong/Ping_Pong_-_Kamikadze.ogg differ
diff --git a/packages/audio/songs/pingpong/license.txt b/packages/audio/songs/pingpong/license.txt
new file mode 100644
index 00000000..5e98cbe3
--- /dev/null
+++ b/packages/audio/songs/pingpong/license.txt
@@ -0,0 +1,19 @@
+Ping_Pong_-_Headshot.ogg
+Ping_Pong_-_Kamikadze.ogg
+
+By Lukas Zapletal (lzap@seznam.cz) and Ludek Horacek (ludek.horacek@worldonline.cz) of "Team Ping-Pong".
+
+These soundtracks are licensed under the "OpenMusic License".
+You should assume that this is the "yellow" license that does not allow commerical 
+redistribution unless you can contact the original authors to specify otherwise.
+
+The "Yellow OpenMusic License" is available here: http://openmusic.linuxtag.org/yellow.html
+
+THE ALBUM IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED.
+
+These soundtracks were originally from here: http://tanecni-olomouc.cz/ping-pong/releases.html
+
+This link has since become out-dated, but can still be found at archive.org:
+	http://web.archive.org/web/20050829161023/tanecni-olomouc.cz/ping-pong/releases.html
diff --git a/packages/audio/songs/pingpong/readme.txt b/packages/audio/songs/pingpong/readme.txt
deleted file mode 100644
index 13338118..00000000
--- a/packages/audio/songs/pingpong/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-These tracks are by Lukas Zapletal & Ludek Horacek (pingpong)
-http://tanecni-olomouc.cz/ping-pong/