diff --git a/CHANGES b/CHANGES
index c46ab22..7c48c56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ Changelog for hydra
 
 
 Release 8.7-dev
+* corrected hydra return code to be 0 on success
 * added patch from debian maintainers which fixes spellings
 * fixed weird crash on x64 systems
 * many warning fixes by crondaemon
diff --git a/hydra.c b/hydra.c
index 1e2013a..cbe6be7 100644
--- a/hydra.c
+++ b/hydra.c
@@ -4100,7 +4100,7 @@ int main(int argc, char *argv[]) {
   }
 
   fflush(NULL);
-  if (error || j || exit_condition < 0)
+  if (error || j != 0 || exit_condition < 0)
     return -1;
   else
     return 0;