diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs
index 647fe23799..5bfee93d30 100644
--- a/OpenRA.Game/Support/Program.cs
+++ b/OpenRA.Game/Support/Program.cs
@@ -49,12 +49,12 @@ namespace OpenRA
 			catch( Exception e )
 			{
 				Log.Write( "{0}", e.ToString() );
-				UploadLog(Game.MasterGameID);
+				UploadLog();
 				throw;
 			}
 		}
 
-		static void UploadLog(int gameId)
+		static void UploadLog()
 		{
 			Log.Close();
 			var logfile = File.OpenRead(Log.Filename);
@@ -71,13 +71,13 @@ namespace OpenRA
 			request.ContentType = "application/x-gzip";
 			request.ContentLength = buffer.Length;
 			request.Method = "POST";
-			request.Headers.Add("Game-ID", gameId.ToString());
+			request.Headers.Add("Game-ID", Game.MasterGameID.ToString());
 	
 			using (var requestStream = request.GetRequestStream())
 				requestStream.Write(buffer, 0, buffer.Length);
 
 			var response = (HttpWebResponse)request.GetResponse();
-			MessageBox.Show(response.GetResponseStream().ReadAllText());
+			MessageBox.Show("{0} {1}:{2}".F(Game.MasterGameID, Game.CurrentHost, Game.CurrentPort));
 		}
 
 		static void Run( string[] args )
diff --git a/OpenRA.Gl/GraphicsDevice.cs b/OpenRA.Gl/GraphicsDevice.cs
index 082363de60..713d07e683 100644
--- a/OpenRA.Gl/GraphicsDevice.cs
+++ b/OpenRA.Gl/GraphicsDevice.cs
@@ -207,12 +207,14 @@ namespace OpenRA.GlRenderer
 								Game.HandleKeyPress(new KeyPressEventArgs((char)e.key.keysym.unicode), mods);
 
 							else if (mods != 0)
-							{
-								var keyName = Sdl.SDL_GetKeyName(e.key.keysym.sym);
+							{
+								var keyName = Sdl.SDL_GetKeyName(e.key.keysym.sym);
 								if (keyName.Length == 1)
 									Game.HandleKeyPress(new KeyPressEventArgs(keyName[0]), mods);
 								else if (keyName == "f4" && ((mods & Modifiers.Alt) != 0))
 									OpenRA.Game.Exit();
+								else if (keyName == "f5")
+									throw new Exception("F5 Pressed.");
 							}
 						} break;
 
diff --git a/web/logs/upload.php b/web/logs/upload.php
index cb518e12ed..8e956265ec 100644
--- a/web/logs/upload.php
+++ b/web/logs/upload.php
@@ -1,19 +1,19 @@
 <?php 
-$post_file = fopen('php://input', 'rb');
-$log_file = fopen('log.'.time().'.gz', 'wb');
+$post_file = fopen('compress.zlib://php://input', 'rb');
+
+$game_id = $_SERVER['HTTP_GAME_ID'];
+
+$log_zip = new ZipArchive();
+$log_zip->open($game_id.'.zip', ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE);
+
 $post_data = '';
 
-while (!feof($post_file)) {
-$post_data .= fread($post_file, 8192);
-}
+while (!feof($post_file))
+    $post_data .= fread($post_file, 8192);
 
-fwrite($log_file, $post_data);
+
+$log_zip->addFromString(md5($_SERVER['REMOTE_ADDR']).'.log',$post_data);
 
 fclose($post_file);
-fclose($log_file);
-
-foreach ($_SERVER as $key=>$value)
-{
-    echo $key.': '.$value.'\n';
-}
+$log_zip->close();
 ?>