diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index edd250deb..b1ede0187 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -640,6 +640,7 @@ void AWeapon::PostMorphWeapon ()
 
 	pspr = Owner->player->GetPSprite(PSP_WEAPON);
 	pspr->y = WEAPONBOTTOM;
+	pspr->ResetInterpolation();
 	pspr->SetState(GetUpState());
 }
 
diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index abbd2284e..2e591e20d 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -262,8 +262,7 @@ void DPSprite::NewTick()
 			while (pspr)
 			{
 				pspr->processPending = true;
-				pspr->oldx = pspr->x;
-				pspr->oldy = pspr->y;
+				pspr->ResetInterpolation();
 
 				pspr = pspr->Next;
 			}
diff --git a/src/p_pspr.h b/src/p_pspr.h
index ea03e109f..64a2702a3 100644
--- a/src/p_pspr.h
+++ b/src/p_pspr.h
@@ -29,11 +29,8 @@
 
 #define WEAPONBOTTOM			128.
 
-// [RH] +0x6000 helps it meet the screen bottom
-//		at higher resolutions while still being in
-//		the right spot at 320x200.
-#define WEAPONTOP				(32+6./16)
-
+#define WEAPONTOP				32.
+#define WEAPON_FUDGE_Y			0.375
 class AInventory;
 
 //
@@ -77,6 +74,7 @@ public:
 	DPSprite*	GetNext()	      { return Next; }
 	AActor*		GetCaller()	      { return Caller; }
 	void		SetCaller(AActor *newcaller) { Caller = newcaller; }
+	void		ResetInterpolation() { oldx = x; oldy = y; }
 
 	double x, y;
 	double oldx, oldy;
diff --git a/src/r_things.cpp b/src/r_things.cpp
index a15921cba..cad434fa5 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -1302,7 +1302,7 @@ void R_DrawPSprite(DPSprite *pspr, AActor *owner, float bobx, float boby, double
 	}
 
 	sx = pspr->oldx + (pspr->x - pspr->oldx) * ticfrac;
-	sy = pspr->oldy + (pspr->y - pspr->oldy) * ticfrac;
+	sy = pspr->oldy + (pspr->y - pspr->oldy) * ticfrac + WEAPON_FUDGE_Y;
 
 	if (pspr->Flags & PSPF_ADDBOB)
 	{
@@ -1610,7 +1610,7 @@ void R_DrawPlayerSprites ()
 			else
 			{
 				wx = weapon->oldx + (weapon->x - weapon->oldx) * r_TicFracF;
-				wy = weapon->oldy + (weapon->y - weapon->oldy) * r_TicFracF;
+				wy = weapon->oldy + (weapon->y - weapon->oldy) * r_TicFracF + WEAPON_FUDGE_Y;
 			}
 		}
 		else