diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 193a19d5d..df879664e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,10 @@
 D1X-Rebirth Changelog
 
-20080401
+20080331
+--------
+main/songs.c: fix divide by 0 bug when there is no music available
+
+20080330
 --------
 main/piggy.c: add support for Mac demo sounds
 
diff --git a/main/songs.c b/main/songs.c
index 6a7d87fd4..77e5660db 100644
--- a/main/songs.c
+++ b/main/songs.c
@@ -171,6 +171,9 @@ void songs_play_level_song( int levelnum )
 
 	if ( !Songs_initialized ) songs_init();
 
+	if (cGameSongsAvailable < 1)
+		return;
+
 	if (levelnum < 0)
 		songnum = (-levelnum) % cGameSongsAvailable;
 	else