diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs
index 13edbfa..af2121d 100755
--- a/Classic/scripts/defaultGame.cs
+++ b/Classic/scripts/defaultGame.cs
@@ -3849,10 +3849,9 @@ function notifyMatchEnd(%time)
 {
    %seconds = mFloor(%time / 1000);
 
-   if (%seconds > 1) {
+   if(%seconds > 1)
       MessageAll('MsgMissionEnd', '\c2Match ends in %1 seconds.~wfx/misc/hunters_%1.wav', %seconds);
-   }
-   else if (%seconds == 1)
+   else if(%seconds == 1)
       MessageAll('MsgMissionEnd', '\c2Match ends in 1 second.~wfx/misc/hunters_1.wav');
 
    UpdateClientTimes(%time);
@@ -3862,9 +3861,15 @@ function notifyMatchEndMinutes(%time)
 {
    %seconds = mFloor(%time / 1000);
 
-   if (%seconds == 180)
+   if(%seconds == 900 && $Host::TournamentMode)
+      MessageAll('MsgMissionEndMinutes', '\c2Match ends in 15 minutes.~wfx/misc/flagself.wav');
+   else if(%seconds == 600 && $Host::TournamentMode)
+      MessageAll('MsgMissionEndMinutes', '\c2Match ends in 10 minutes.~wfx/misc/flagself.wav');
+   else if(%seconds == 300 && $Host::TournamentMode)
+      MessageAll('MsgMissionEndMinutes', '\c2Match ends in 5 minutes.~wfx/misc/flagself.wav');
+   else if(%seconds == 180)
       MessageAll('MsgMissionEndMinutes', '\c2Match ends in 3 minutes.~wfx/misc/flagself.wav');
-   else if (%seconds == 120)
+   else if(%seconds == 120)
       MessageAll('MsgMissionEndMinutes', '\c2Match ends in 2 minutes.~wfx/misc/flagself.wav');
 
    UpdateClientTimes(%time);
diff --git a/Classic/scripts/server.cs b/Classic/scripts/server.cs
index f9ef39f..3335c22 100644
--- a/Classic/scripts/server.cs
+++ b/Classic/scripts/server.cs
@@ -899,8 +899,8 @@ function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice,
                     %client.isSuperAdmin,
                     %client.isSmurf,
                     %client.sendGuid );
-       // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
 
+       // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
       messageAllExcept(%client, -1, 'MsgClientJoin', '\c1%1 joined the game.',
                        %client.name,
                        %client,
@@ -3089,6 +3089,12 @@ function EndCountdown(%timeMS)
    else
       return;
 
+   if(%timeMS >= 900000 && $Host::TournamentMode)
+      Game.endfifteenminuteCount = schedule(%timeMS - 900000, Game, "notifyMatchEndMinutes", 900000);
+   if(%timeMS >= 600000 && $Host::TournamentMode)
+      Game.endtenminuteCount = schedule(%timeMS - 600000, Game, "notifyMatchEndMinutes", 600000);
+   if(%timeMS >= 300000 && $Host::TournamentMode)
+      Game.endfiveminuteCount = schedule(%timeMS - 300000, Game, "notifyMatchEndMinutes", 300000);
    if(%timeMS >= 180000)
       Game.endthreeminuteCount = schedule(%timeMS - 180000, Game, "notifyMatchEndMinutes", 180000);
    if(%timeMS >= 120000)