diff --git a/OpenRa.Game/Traits/RenderSpy.cs b/OpenRa.Game/Traits/RenderSpy.cs
index c09bdc6859..2ed11ac76e 100644
--- a/OpenRa.Game/Traits/RenderSpy.cs
+++ b/OpenRa.Game/Traits/RenderSpy.cs
@@ -6,9 +6,9 @@ using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits
 {
-	class RenderSpyInfo : ITraitInfo
+	class RenderSpyInfo : RenderInfantryInfo
 	{
-		public object Create(Actor self) { return new RenderSpy(self); }
+		public override object Create(Actor self) { return new RenderSpy(self); }
 	}
 
 	class RenderSpy : RenderInfantry, IRenderModifier
diff --git a/OpenRa.Game/Traits/Spy.cs b/OpenRa.Game/Traits/Spy.cs
index ad89697422..922b0573b4 100644
--- a/OpenRa.Game/Traits/Spy.cs
+++ b/OpenRa.Game/Traits/Spy.cs
@@ -14,7 +14,8 @@ namespace OpenRa.Game.Traits
 		{
 			if (mi.Button != MouseButton.Right) return null;
 			if (underCursor == null) return null;
-			if (underCursor.traits.Contains<IAcceptSpy>()) return null;
+			if (underCursor.Owner == self.Owner) return null;
+			if (!underCursor.traits.Contains<IAcceptSpy>()) return null;
 
 			return new Order("Infiltrate", self, underCursor, int2.Zero, null);
 		}
diff --git a/ra.yaml b/ra.yaml
index e3ce4e1595..5587785c72 100644
--- a/ra.yaml
+++ b/ra.yaml
@@ -2138,8 +2138,12 @@ SPY:
 		HP: 25
 		Sight: 5
 		Speed: 4
+	Mobile:
+		MovementType: Wheel
+	RenderSpy:
 	TakeCover:
 	Spy:
+	-RenderInfantry:
 	-AutoTarget:
 
 THF: