diff --git a/ChangeLog b/ChangeLog
index f8b13e3d14..f1f5856e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  7 14:47:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/internal.h: Use gnulib gettext library.  Define
+	  INET_ADDRSTRLEN unless already defined.
+
 Fri Dec  7 14:36:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/.cvsignore: Ignore *.loT files (generated under Windows).
@@ -8,6 +13,10 @@ Fri Dec  7 14:36:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 	  configured --without-qemu.
 	* src/nodeinfo.c: If no 'uname' function, set model name to
 	  empty string (for Windows).
+	* src/xen_unified.h, src/util.c, src/test.c: Include <winsock2.h>
+	  on Windows.
+	* src/util.c: Disable virExec* and virFileLinkPointsTo on
+	  MinGW.
 
 Fri Dec  7 14:34:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
diff --git a/src/internal.h b/src/internal.h
index 563831b250..50842cb1e7 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -12,11 +12,12 @@
 #include <sys/syslimits.h>
 #endif
 
+#include "gettext.h"
+
 #include "hash.h"
 #include "libvirt/libvirt.h"
 #include "libvirt/virterror.h"
 #include "driver.h"
-#include <libintl.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,9 +37,12 @@ extern "C" {
 #define IF_NAMESIZE 16
 #endif
 
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
 #define _(str) dgettext(GETTEXT_PACKAGE, (str))
 #define N_(str) dgettext(GETTEXT_PACKAGE, (str))
-#define gettext_noop(str) (str)
 
 /* String equality tests, suggested by Jim Meyering. */
 #define STREQ(a,b) (strcmp((a),(b)) == 0)