diff --git a/ChangeLog b/ChangeLog
index c20116d68..575028410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07  Hans Breuer  <hans@breuer.org>
+
+	* glib/makefile.msc.in : added gbase64.obj and derive the static libs
+	name from auto* variables
+	* glib/makefile.msc.in : link user32.lib for MessageBox()
+
 2006-04-07  Martyn Russell  <martyn@imendio.com>
 
 	* glib/gasyncqueue.[ch]: Added private API
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c20116d68..575028410 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-04-07  Hans Breuer  <hans@breuer.org>
+
+	* glib/makefile.msc.in : added gbase64.obj and derive the static libs
+	name from auto* variables
+	* glib/makefile.msc.in : link user32.lib for MessageBox()
+
 2006-04-07  Martyn Russell  <martyn@imendio.com>
 
 	* glib/gasyncqueue.[ch]: Added private API
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index bf6247946..76fe588d4 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -18,7 +18,7 @@ all :				\
 	galiasdef.c		\
 	gnulib\gnulib.lib	\
 	libglib-2.0-0.dll \
-	glib-2.9s.lib \
+	glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
 	gspawn-win32-helper.exe	\
 
 
@@ -32,6 +32,7 @@ glib_OBJECTS =			\
 	gasyncqueue.obj		\
 	gatomic.obj	\
 	gbacktrace.obj		\
+	gbase64.obj	\
 	gbookmarkfile.obj 	\
 	gcache.obj		\
 	gcompletion.obj		\
diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index c672e29c2..226bf9cd8 100644
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -23,4 +23,4 @@ gthread.res : gthread.rc
 
 libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def gthread.res
 	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
-	..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
+	..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def