diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index a1712eaba..3c3eb4b48 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,10 @@
-April 8, 2009
+April 9, 2009  (Changes by Graf Zahl)
+- Added NOBLOCKMAP/MOVEWITHSECTOR combination to a few items that had their
+  NOBLOCKMAP flag taken away previously to make them move with a sector.
+  This should fix the performance problem Claustrophobia had with recent
+  ZDoom versions.
+
+April 8, 2009
 - Added MF5_MOVEWITHSECTOR flag, so you can have the benefits of MF_NOBLOCKMAP
   but still have actors that will move up and down with the floor. IceChunk
   now uses both of these flags.
diff --git a/wadsrc/static/actors/doom/doomdecorations.txt b/wadsrc/static/actors/doom/doomdecorations.txt
index 69882fa95..9d2d230eb 100644
--- a/wadsrc/static/actors/doom/doomdecorations.txt
+++ b/wadsrc/static/actors/doom/doomdecorations.txt
@@ -741,6 +741,8 @@ ACTOR ColonGibs 79
 	SpawnID 147
 	Radius 20
 	Height 4
+	+NOBLOCKMAP
+	+MOVEWITHSECTOR
 	States
 	{
 	Spawn:
@@ -757,6 +759,8 @@ ACTOR SmallBloodPool 80
 	SpawnID 148
 	Radius 20
 	Height 1
+	+NOBLOCKMAP
+	+MOVEWITHSECTOR
 	States
 	{
 	Spawn:
@@ -773,6 +777,8 @@ ACTOR BrainStem 81
 	SpawnID 150
 	Radius 20
 	Height 4
+	+NOBLOCKMAP
+	+MOVEWITHSECTOR
 	States
 	{
 	Spawn:
diff --git a/wadsrc/static/actors/heretic/hereticimp.txt b/wadsrc/static/actors/heretic/hereticimp.txt
index 81c212b86..1d663b662 100644
--- a/wadsrc/static/actors/heretic/hereticimp.txt
+++ b/wadsrc/static/actors/heretic/hereticimp.txt
@@ -101,6 +101,8 @@ ACTOR HereticImpChunk1
 {
 	Mass 5
 	Radius 4
+	+NOBLOCKMAP
+	+MOVEWITHSECTOR
 	States
 	{
 	Spawn:
@@ -116,6 +118,8 @@ ACTOR HereticImpChunk2
 {
 	Mass 5
 	Radius 4
+	+NOBLOCKMAP
+	+MOVEWITHSECTOR
 	States
 	{
 	Spawn: