diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index bc300456bd..bc714ecfa5 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -362,6 +362,8 @@ CRC::Game CRC::m_games[] =
 	{0x73C560BA, FinalFightStreetwise, EU, 0},
 	{0xCBB87BF9, EvangelionJo, JP, 0}, // cutie comment
 	{0xC5B75C7C, Oneechanbara2Special, JP, 0}, // cutie comment
+	{0xC725CC6C, Oneechanbara2Special, JP, 0},
+	{0x07608CA2, Oneechanbara2Special, EU, 0}, // Zombie Hunters 2
 	{0xC0659AD1, NarutimateAccel, JP, 0}, // cutie comment
 	{0xF3D9DFBE, NarutimateAccel, JP, 0},
 	{0x59739DDE, Naruto, JP, 0}, // cutie comment
diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
index 5d20b2dea3..4a9e7f3ea3 100644
--- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp
+++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
@@ -347,9 +347,11 @@ bool GSC_Oneechanbara2Special(const GSFrameInfo& fi, int& skip)
 {
 	if(skip == 0)
 	{
-		if(fi.TPSM == PSM_PSMCT24 && fi.TME && fi.FBP == 0x01180)
+		if((Aggressive || !s_nativeres) && fi.TPSM == PSM_PSMCT24 && fi.TME && fi.FBP == 0x01180)
 		{
-			skip = 1; // Ghosting
+			// Don't enable hack on native res if crc is below aggressive.
+			// Ghosting upscaling issue, bottom and right red lines also by upscaling.
+			skip = 1;
 		}
 	}