diff --git a/changelog.txt b/changelog.txt
index 31a96a4ba..69d27cc5b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,6 +7,7 @@ Notes:
 	- Only CMake accessible flags were corrected if adding the 'std' namespace did not correct the issue
 	- the tag [CODEBUG] was added to code identifed by the above note
 	- If you are having compile issues after this patch is committed, look to the changes here first
+Uleat: Changed riposte enabling check to proper failure criteria (x == 1 && x == 2 never fails) (discovery find, no known reported occurences)
 
 == 10/24/2013 ==
 demonstar55: Fix some memory leaks in Mob::SpellOnTarget
diff --git a/zone/bot.cpp b/zone/bot.cpp
index b5596f4ff..e68669aea 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -8086,7 +8086,7 @@ void Bot::DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int
 
 	else{
 		bool CanRiposte = true;
-		if(skill == THROWING && skill == ARCHERY)
+		if(skill == THROWING || skill == ARCHERY) // changed from '&&'
 			CanRiposte = false;
 
 		who->AvoidDamage(this, max_damage, CanRiposte);
diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp
index 7873c47ef..c314d2fed 100644
--- a/zone/special_attacks.cpp
+++ b/zone/special_attacks.cpp
@@ -132,7 +132,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int
 
 	else{
 		bool CanRiposte = true;
-		if(skill == THROWING && skill == ARCHERY)
+		if(skill == THROWING || skill == ARCHERY) // changed from '&&'
 			CanRiposte = false;
 
 		who->AvoidDamage(this, max_damage, CanRiposte);