diff --git a/ChangeLog b/ChangeLog
index 0bb206f3e..4d22cf5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 PolarSSL ChangeLog
 
+= Version 1.2.19 released 2015-12-xx
+
+Bugfix
+   * Fix bug in certificate validation that caused valid chains to be rejected
+     when the first intermediate certificate has pathLenConstraint=0. Found by
+     Nicholas Wilson. Introduced in mbed TLS 1.3.15. #280
+
 = Version 1.2.18 released 2015-11-04
 
 Security
diff --git a/library/x509parse.c b/library/x509parse.c
index c9db3fa5a..f0cf3a512 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -3679,15 +3679,6 @@ int x509parse_verify( x509_cert *crt,
             continue;
         }
 
-        /* +2 because the current step is not yet accounted for
-         * and because max_pathlen is one higher than it should be */
-        if( parent->max_pathlen > 0 &&
-            parent->max_pathlen < 2 + pathlen )
-        {
-            parent = parent->next;
-            continue;
-        }
-
         break;
     }