diff --git a/src/m_fixed.h b/src/m_fixed.h
index 14db59d6..61080d73 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -139,5 +139,6 @@ inline SDWORD ModDiv (SDWORD num, SDWORD den, SDWORD *dmval)
 
 #define FLOAT2FIXED(f)		xs_Fix<16>::ToFix(f)
 #define FIXED2FLOAT(f)		((f) / float(65536))
+#define FIXED2DBL(f)		((f) / double(65536))
 
 #endif
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index b789f22b..e7fff7d7 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -2536,7 +2536,8 @@ enum
 	APROP_DamageFactor	= 24,
 	APROP_MasterTID     = 25,
 	APROP_TargetTID		= 26,
-	APROP_TracerTID		= 27
+	APROP_TracerTID		= 27,
+	APROP_WaterLevel	= 28
 };	
 
 // These are needed for ACS's APROP_RenderStyle
@@ -2778,6 +2779,7 @@ int DLevelScript::GetActorProperty (int tid, int property)
 	case APROP_MasterTID:	return DoGetMasterTID (actor);
 	case APROP_TargetTID:	return (actor->target != NULL)? actor->target->tid : 0;
 	case APROP_TracerTID:	return (actor->tracer != NULL)? actor->tracer->tid : 0;
+	case APROP_WaterLevel:	return actor->waterlevel;
 	default:				return 0;
 	}
 }
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 1d6e8d40..79c20c1e 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -4526,6 +4526,8 @@ void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, angle_t dir, int damage, AAc
 		th = Spawn (bloodcls, x, y, z, NO_REPLACE); // GetBloodType already performed the replacement
 		th->velz = FRACUNIT*2;
 		th->angle = dir;
+		// [NG] Applying PUFFGETSOWNER to the blood will make it target the owner
+		if (th->flags5 & MF5_PUFFGETSOWNER) th->target = originator;
 		if (gameinfo.gametype & GAME_DoomChex)
 		{
 			th->tics -= pr_spawnblood() & 3;
@@ -4667,6 +4669,8 @@ void P_RipperBlood (AActor *mo, AActor *bleeder)
 	{
 		AActor *th;
 		th = Spawn (bloodcls, x, y, z, NO_REPLACE); // GetBloodType already performed the replacement
+		// [NG] Applying PUFFGETSOWNER to the blood will make it target the owner
+		if (th->flags5 & MF5_PUFFGETSOWNER) th->target = bleeder;
 		if (gameinfo.gametype == GAME_Heretic)
 			th->flags |= MF_NOGRAVITY;
 		th->velx = mo->velx >> 1;
diff --git a/src/svnrevision.h b/src/svnrevision.h
index fa451fc8..ecc983ce 100644
--- a/src/svnrevision.h
+++ b/src/svnrevision.h
@@ -3,5 +3,5 @@
 // This file was automatically generated by the
 // updaterevision tool. Do not edit by hand.
 
-#define ZD_SVN_REVISION_STRING "2981"
-#define ZD_SVN_REVISION_NUMBER 2981
+#define ZD_SVN_REVISION_STRING "2987"
+#define ZD_SVN_REVISION_NUMBER 2987