diff --git a/ChangeLog b/ChangeLog
index 8d08f7e0..7ebaf04b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-19  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #43626: Inconsistent timeouts in stk500v2
+	* stk500v2.c (stk500v2_recv): Add a reference to the bug report
+	but don't change anything, lest to break it somehow
+
 2014-11-14  Rene Liebscher <R.Liebscher@gmx.de>
 
 	patch #8529 2 more ftdi_syncbb devices
diff --git a/stk500v2.c b/stk500v2.c
index 53b92917..5f1f79ed 100644
--- a/stk500v2.c
+++ b/stk500v2.c
@@ -624,6 +624,11 @@ static int stk500v2_recv(PROGRAMMER * pgm, unsigned char *msg, size_t maxsize) {
   int timeout = 0;
   unsigned char c, checksum = 0;
 
+  /*
+   * The entire timeout handling here is not very consistent, see
+   *
+   * https://savannah.nongnu.org/bugs/index.php?43626
+   */
   long timeoutval = SERIAL_TIMEOUT;		// seconds
   struct timeval tv;
   double tstart, tnow;