diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c2abbc1192515661fa7e34c4577751436fc82fe3..ad8ffa8b754d705364107f3364178685e1019cf9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-21  Ben Key  <bkey76@gmail.com>  (tiny change)
+
+	* make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to
+	the new BVAR macro.
+
 2011-02-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in (obj): Remove md5.o.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 93994c1ed3eefab31e600b97d2cd56d7b20c41d7..1f370555051e1743e586c971860166e99e8f41bc 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -815,7 +815,7 @@ scan_c_file (char *filename, const char *mode)
       if (defunflag)
 	commas = 5;
       else if (defvarperbufferflag)
-	commas = 2;
+	commas = 3;
       else if (defvarflag)
 	commas = 1;
       else  /* For DEFSIMPLE and DEFPRED */