diff --git a/ChangeLog b/ChangeLog
index 8c7bb8529..6aa1d95cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-27  Robert Love  <rml@novell.com>
+
+	Patch by Jürg Billeter <j@bitron.ch>:
+	* src/nm-logging.c: Add printf modifier to fix warning on 64-bit
+	  systems.
+	* src/nm-netlink-monitor.c: Include <net/if.h> instead of <linux/if.h>
+	  as we prefer glibc over kernel headers, if possible.
+
 2006-03-27  Robert Love  <rml@novell.com>
 
 	Patch by Jon Escombe <list@dresco.co.uk>:
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 7d409cd4f..b2d34ab4c 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -46,7 +46,7 @@ fallback_get_backtrace (void)
 	{
 		syslog (LOG_CRIT, "******************* START **********************************");
 		for (i = 0; i < size; i++)
-			syslog (LOG_CRIT, "Frame %d: %s", i, strings[i]);
+			syslog (LOG_CRIT, "Frame %zd: %s", i, strings[i]);
 		free (strings);
 		syslog (LOG_CRIT, "******************* END **********************************");
 	}
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index 8d9297e5f..5ee4b3453 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/unistd.h>
 #include <unistd.h>
 #include <stdio.h>