diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3f7e33435..8ffe94f1f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20100615
+--------
+main/game.c, main/gameseq.c: Resetting GameTime, Next/Last_flare/laser/missile_time in reset_time() together so GameTime-rollover-fallbacks will not create a massive delay when starting a new level
+
 20100614
 --------
 include/args.h, include/physfsx.h, main/inferno.c, main/menu.c, main/movie.c, main/songs.c, main/songs.h, main/switch.c, main/config.c, main/config.h, main/gameseq.c, main/digiobj.c, main/digi.h, main/game.c, main/gamecntl.c, misc/args.c, CHANGELOG.txt, d2x.ini, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/init.c, arch/sdl/jukebox.c, arch/sdl/digi.c, arch/sdl/digi_audio.c, arch/include/digi_audio.h, arch/include/digi_mixer.h, arch/include/digi_mixer_music.h, arch/include/jukebox.h: Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
diff --git a/main/game.c b/main/game.c
index 939879f09..fee3f91ab 100644
--- a/main/game.c
+++ b/main/game.c
@@ -149,6 +149,8 @@ int	Game_turbo_mode = 0;
 int	Game_mode = GM_GAME_OVER;
 int	Global_laser_firing_count = 0;
 int	Global_missile_firing_count = 0;
+fix	Next_flare_fire_time = 0;
+#define	FLARE_BIG_DELAY	(F1_0*2)
 
 //	Function prototypes for GAME.C exclusively.
 
@@ -477,6 +479,7 @@ void FixedStepCalc()
 
 void reset_time()
 {
+	GameTime = Next_flare_fire_time = Last_laser_fired_time = Next_laser_fire_time = Next_missile_fire_time = 0;
 	last_timer_value = timer_get_fixed_seconds();
 }
 
@@ -839,9 +842,6 @@ int allowed_to_fire_laser(void)
 	return 1;
 }
 
-fix	Next_flare_fire_time = 0;
-#define	FLARE_BIG_DELAY	(F1_0*2)
-
 int allowed_to_fire_flare(void)
 {
 	if (Next_flare_fire_time > GameTime)
diff --git a/main/gameseq.c b/main/gameseq.c
index 80b40d62f..ce09c7398 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -1826,7 +1826,6 @@ void StartNewLevel(int level_num, int secret_flag)
 {
 	hide_menus();
 
-	GameTime = FrameTime;
 	ThisLevelTime=0;
 
 	if ((level_num > 0) && (!secret_flag)) {