diff --git a/ChangeLog b/ChangeLog
index 624eb8a5d5..25111e0d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,20 @@
+2006-01-09  Robert Love  <rml@novell.com>
+
+	* src/nm-device-802-3-ethernet.h:  The kernel headers <linux/mii.h> and
+	  <linux/ethtool.h> leak the kernel-only types u16, u32, et al.
+	  User-space does not supply these types, so we have to define them
+	  ourselves.  The relevant kernel maintainer refused to accept a patch
+	  switching these headers to the propre C99 types.
+
 2006-01-09  Dan Williams  <dcbw@redhat.com>
 
 	Apply Robert's 'tray icon redo' patch with fixes
-
 	* gnome/applet/applet.c
 	  gnome/applet/applet.h
 		- Instead of using a menu bar + menu item, simulate menu
 			behavior using a popup menu.  Highlight the area around
-			the icon more like a menu too, by playing with the applet's
-			size requisition
+			the icon more like a menu too, by playing with the
+			applet's size requisition
 
 2006-01-09  Timo Hoenig   <thoenig@suse.de>
 	* libnm-util/dbus-helpers.c
diff --git a/src/nm-device-802-3-ethernet.h b/src/nm-device-802-3-ethernet.h
index 62d96c4b54..f911c126a1 100644
--- a/src/nm-device-802-3-ethernet.h
+++ b/src/nm-device-802-3-ethernet.h
@@ -26,9 +26,20 @@
 #include <dbus/dbus.h>
 #include <net/ethernet.h>
 
-
 #include "nm-device.h"
 
+/*
+ * The kernel headers <linux/mii.h> and <linux/ethtool.h> leak the kernel-only
+ * types u16, u32, et al.  User-space does not supply these types, so we define
+ * them here.
+ */
+#ifndef u64
+# define u64	__u64
+# define u32	__u32
+# define u16	__u16
+# define u8	__u8
+#endif
+
 G_BEGIN_DECLS
 
 #define NM_TYPE_DEVICE_802_3_ETHERNET			(nm_device_802_3_ethernet_get_type ())