diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 0a67b2834..6cea46022 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+July 17, 2006 (Changes by Graf Zahl)
+- Fixed: PClass::CreateDerivedClass forgot to NULL FActorInfo::Replacee.
+
 July 16, 2006 (Changes by Graf Zahl)
 - Fixed: S_ClearSoundData cleared PlayerClasses instead of PlayerClassLookups.
 - Added NecroMage's submission for bitwise/shift assignment operators for ACS.
diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index dfc05963a..a924c3ff2 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -211,6 +211,7 @@ PClass *PClass::CreateDerivedClass (FName name, unsigned int size)
 		info->OwnedStates = NULL;
 		info->NumOwnedStates = 0;
 		info->Replacement = NULL;
+		info->Replacee = NULL;
 		m_RuntimeActors.Push (type);
 	}
 	return type;
diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp
index b4f5bf59f..8000f43fb 100644
--- a/src/s_advsound.cpp
+++ b/src/s_advsound.cpp
@@ -494,7 +494,7 @@ static int S_AddSound (const char *logicalname, int lumpnum)
 int S_AddPlayerSound (const char *pclass, int gender, int refid,
 	const char *lumpname)
 {
-	int lump;
+	int lump=-1;
 	
 	if (lumpname)
 	{