diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c2319d6486b..4050c9c5a83 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (get_server_config): Declare set_fg as FARPROC to
+	avoid a compiler warning.
+
 2006-11-07  Juanma Barranquero  <lekktu@gmail.com>
 
 	* emacsclient.c (get_server_config) [WINDOWSNT]: Look for the server
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9925d5ca8da..de966981171 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-08  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (setwins): Remove.
+	(WINS_ALMOST): New macro.
+	(WINS): Use it.
+	(autoloads): Don't extract autoloads from files in obsolete/.
+
 2006-11-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* whitespace.el (whitespace-buffer): Call remove-overlays after