diff --git a/Source/inv.cpp b/Source/inv.cpp
index 287914433..8bfb5c637 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1094,7 +1094,14 @@ void CheckInvPaste(int pnum, int mx, int my)
 	if (plr[pnum].HoldItem._iLoc == il)
 		done = TRUE;
 	if (il == ILOC_ONEHAND && plr[pnum].HoldItem._iLoc == ILOC_TWOHAND) {
-		il = ILOC_TWOHAND;
+#ifdef HELLFIRE
+			if (plr[pnum]._pClass == PC_BARBARIAN
+				&& (plr[pnum].HoldItem._itype == ITYPE_SWORD || plr[pnum].HoldItem._itype == ITYPE_MACE)
+			)
+				il = ILOC_ONEHAND;
+			else
+#endif
+				il = ILOC_TWOHAND;
 		done = TRUE;
 	}
 	if (plr[pnum].HoldItem._iLoc == ILOC_UNEQUIPABLE && il == ILOC_BELT) {
@@ -1170,6 +1177,16 @@ void CheckInvPaste(int pnum, int mx, int my)
 			PlaySFX(PS_ROGUE13);
 		else if (plr[pnum]._pClass == PC_SORCERER)
 			PlaySFX(PS_MAGE13);
+#endif
+#ifdef HELLFIRE
+		else if (plr[pnum]._pClass == PC_MONK)
+			PlaySFX(PS_MONK13);
+#ifndef SPAWN
+		else if (plr[pnum]._pClass == PC_BARD)
+			PlaySFX(PS_ROGUE13);
+#endif
+		else if (plr[pnum]._pClass == PC_BARBARIAN)
+			PlaySFX(PS_MAGE13);
 #endif
 	}