diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 4fc95183a5..4f02a7fa10 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+July 15, 2008 (Changes by Graf Zahl)
+- Fixed: Strife's EntityBoss didn't copy friendliness information to the
+  sub-entities.
+
 July 12, 2008 (Changes by Graf Zahl)
 - Fixed: Friendly spectral monsters should be able to hurt unfriendly ones
   and vice versa.
diff --git a/src/g_strife/a_entityboss.cpp b/src/g_strife/a_entityboss.cpp
index b87f621183..d9c66c1c12 100644
--- a/src/g_strife/a_entityboss.cpp
+++ b/src/g_strife/a_entityboss.cpp
@@ -326,7 +326,8 @@ void A_SpawnEntity (AActor *self)
 	if (entity != NULL)
 	{
 		entity->angle = self->angle;
-		entity->target = self->target;
+		entity->CopyFriendliness(self, true);
+		//entity->target = self->target;
 		entity->momz = 5*FRACUNIT;
 	}
 }
@@ -341,7 +342,8 @@ void A_SpawnSubEntities (AActor *selfa)
 	an = self->angle >> ANGLETOFINESHIFT;
 	second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
 		self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
-	second->target = self->target;
+	second->CopyFriendliness(self, true);
+	//second->target = self->target;
 	A_FaceTarget (second);
 	an = second->angle >> ANGLETOFINESHIFT;
 	second->momx += FixedMul (finecosine[an], 320000);
@@ -350,7 +352,8 @@ void A_SpawnSubEntities (AActor *selfa)
 	an = (self->angle + ANGLE_90) >> ANGLETOFINESHIFT;
 	second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
 		self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
-	second->target = self->target;
+	second->CopyFriendliness(self, true);
+	//second->target = self->target;
 	second->momx = FixedMul (secondRadius, finecosine[an]) << 2;
 	second->momy = FixedMul (secondRadius, finesine[an]) << 2;
 	A_FaceTarget (second);
@@ -358,7 +361,8 @@ void A_SpawnSubEntities (AActor *selfa)
 	an = (self->angle - ANGLE_90) >> ANGLETOFINESHIFT;
 	second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
 		self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
-	second->target = self->target;
+	second->CopyFriendliness(self, true);
+	//second->target = self->target;
 	second->momx = FixedMul (secondRadius, finecosine[an]) << 2;
 	second->momy = FixedMul (secondRadius, finesine[an]) << 2;
 	A_FaceTarget (second);