diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fc6d905cfb2..d225b77f156 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and
+	byte-code forms.  (Bug#11380)
+
 2012-04-20  Chong Yidong  <cyd@gnu.org>
 
 	* emacsclient.c (decode_options): Move -t -n corner case handling
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3e79cae4f41..b33b13f34ce 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1361,7 +1361,7 @@ scan_lisp_file (const char *filename, const char *mode)
 #ifdef DEBUG
       else if (! strcmp (buffer, "if")
 	       || ! strcmp (buffer, "byte-code"))
-	;
+	continue;
 #endif
 
       else