diff --git a/OpenRa.FileFormats/ShroudPaletteRemap.cs b/OpenRa.FileFormats/ShroudPaletteRemap.cs
index be08298412..a889831269 100644
--- a/OpenRa.FileFormats/ShroudPaletteRemap.cs
+++ b/OpenRa.FileFormats/ShroudPaletteRemap.cs
@@ -13,9 +13,9 @@ namespace OpenRa.FileFormats
 			// false-color version for debug
 
 			//return new[] { 
-			//    Color.Orange, Color.Green, 
+			//    Color.FromArgb(64,0,0,0), Color.Green, 
 			//    Color.Blue, Color.Yellow, 
-			//    Color.Black, 
+			//    Color.Green, 
 			//    Color.Red, 
 			//    Color.Purple, 
 			//    Color.Cyan}[index % 8];
diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs
index d0adbf6ebf..d981e746b3 100644
--- a/OpenRa.Game/Graphics/TerrainRenderer.cs
+++ b/OpenRa.Game/Graphics/TerrainRenderer.cs
@@ -66,6 +66,16 @@ namespace OpenRa.Graphics
 			if (firstRow < 0) firstRow = 0;
 			if (lastRow > map.Height) lastRow = map.Height;
 
+			if (!Game.world.LocalPlayer.Shroud.HasGPS && Game.world.LocalPlayer.Shroud.bounds.HasValue)
+			{
+				var r = Game.world.LocalPlayer.Shroud.bounds.Value;
+				if (firstRow < r.Top - map.YOffset)
+					firstRow = r.Top - map.YOffset;
+
+				if (firstRow > r.Bottom - map.YOffset)
+					firstRow = r.Bottom - map.YOffset;
+			}
+
 			renderer.SpriteShader.Quality = ShaderQuality.Low;
 			renderer.SpriteShader.Render(() =>
 				renderer.DrawBatch(vertexBuffer, indexBuffer,
diff --git a/OpenRa.Game/Graphics/WorldRenderer.cs b/OpenRa.Game/Graphics/WorldRenderer.cs
index a295547a9c..c73f1886f4 100644
--- a/OpenRa.Game/Graphics/WorldRenderer.cs
+++ b/OpenRa.Game/Graphics/WorldRenderer.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRa.Traits;
+using System;
 
 namespace OpenRa.Graphics
 {
@@ -59,6 +60,23 @@ namespace OpenRa.Graphics
 
 		public void Draw()
 		{
+			if (!world.LocalPlayer.Shroud.HasGPS && world.LocalPlayer.Shroud.bounds.HasValue)
+			{
+				var r = world.LocalPlayer.Shroud.bounds.Value;
+				
+				var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
+				var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
+				var right = left + (int)(Game.CellSize * r.Width);
+				var bottom = top + (int)(Game.CellSize * r.Height);
+
+				if (left < 0) left = 0;
+				if (top < 0) top = 0;
+				if (right > Game.viewport.Width) right = Game.viewport.Width;
+				if (bottom > Game.viewport.Height) bottom = Game.viewport.Height;
+
+				renderer.Device.EnableScissor(left, top, right - left, bottom - top);
+			}
+
 			terrainRenderer.Draw(Game.viewport);
 
 			var comparer = new SpriteComparer();
diff --git a/OpenRa.Game/Shroud.cs b/OpenRa.Game/Shroud.cs
index e4dea33745..a70a239463 100644
--- a/OpenRa.Game/Shroud.cs
+++ b/OpenRa.Game/Shroud.cs
@@ -6,6 +6,7 @@ using IjwFramework.Types;
 using OpenRa.Graphics;
 using OpenRa.Traits;
 using OpenRa.FileFormats;
+using System.Drawing;
 
 namespace OpenRa
 {
@@ -18,6 +19,7 @@ namespace OpenRa
 		bool hasGPS = false;
 		Player owner;
 		Map map;
+		public Rectangle? bounds;
 
 		public Shroud(Player owner, Map map) { this.owner = owner; this.map = map; }
 		
@@ -70,8 +72,20 @@ namespace OpenRa
 			return IsExplored(x,y);
 		}
 
+		Rectangle MakeRect(int2 center, int range)
+		{
+			return new Rectangle(center.X - range, center.Y - range, 2 * range + 1, 2 * range + 1);
+		}
+
 		public void Explore(World w, int2 center, int range)
 		{
+			if (range == 0)
+				return;
+
+			var box = MakeRect(center, range);
+			bounds = bounds.HasValue ? 
+				Rectangle.Union(bounds.Value, box) : box;
+			
 			foreach (var t in w.FindTilesInCircle(center, range))
 			{
 				explored[t.X, t.Y] = true;
@@ -141,10 +155,16 @@ namespace OpenRa
 						sprites[i, j] = ChooseShroud(i, j);
 			}
 
-			for (var j = map.YOffset; j < map.YOffset + map.Height; j++)
+			var miny = bounds.HasValue ? Math.Max(map.YOffset, bounds.Value.Top) : map.YOffset;
+			var maxy = bounds.HasValue ? Math.Min(map.YOffset + map.Height, bounds.Value.Bottom) : map.YOffset + map.Height;
+
+			var minx = bounds.HasValue ? Math.Max(map.XOffset, bounds.Value.Left) : map.XOffset;
+			var maxx = bounds.HasValue ? Math.Min(map.XOffset + map.Width, bounds.Value.Right) : map.XOffset + map.Width;
+
+			for (var j = miny; j < maxy; j++)
 			{
-				var starti = map.XOffset;
-				for (var i = map.XOffset; i < map.XOffset + map.Width; i++)
+				var starti = minx;
+				for (var i = minx; i < maxx; i++)
 				{
 					if (sprites[i, j] == shadowBits[0x0f])
 						continue;
@@ -164,11 +184,11 @@ namespace OpenRa
 					starti = i+1;
 				}
 
-				if (starti < map.XOffset + map.Width)
+				if (starti < maxx)
 					r.DrawSprite(sprites[starti, j],
 						Game.CellSize * new float2(starti, j),
 						PaletteType.Shroud,
-						new float2(Game.CellSize * (map.XOffset + map.Width - starti), Game.CellSize));
+						new float2(Game.CellSize * (maxx - starti), Game.CellSize));
 			}
 		}
 	}