diff --git a/data/multiplay/skirmish/player0.slo b/data/multiplay/skirmish/player0.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player0.slo
+++ b/data/multiplay/skirmish/player0.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player1.slo b/data/multiplay/skirmish/player1.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player1.slo
+++ b/data/multiplay/skirmish/player1.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player2.slo b/data/multiplay/skirmish/player2.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player2.slo
+++ b/data/multiplay/skirmish/player2.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player3.slo b/data/multiplay/skirmish/player3.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player3.slo
+++ b/data/multiplay/skirmish/player3.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player4.slo b/data/multiplay/skirmish/player4.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player4.slo
+++ b/data/multiplay/skirmish/player4.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player5.slo b/data/multiplay/skirmish/player5.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player5.slo
+++ b/data/multiplay/skirmish/player5.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player6.slo b/data/multiplay/skirmish/player6.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player6.slo
+++ b/data/multiplay/skirmish/player6.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }
 
diff --git a/data/multiplay/skirmish/player7.slo b/data/multiplay/skirmish/player7.slo
index af89bf0aa..ab9eb0464 100644
--- a/data/multiplay/skirmish/player7.slo
+++ b/data/multiplay/skirmish/player7.slo
@@ -1964,7 +1964,15 @@ event takeover(takeoverTr)
 {
 	if( droid.player == me )
 	{
-		groupAddDroid( attackGroup, droid );
+		if(droid.droidType == DROID_CONSTRUCT or
+				droid.droidType == DROID_CYBORG_CONSTRUCT)
+		{
+			groupAddDroid( buildGroup, droid );
+		}
+		else
+		{
+			groupAddDroid( attackGroup, droid );
+		}
 	}
 }