diff --git a/CHANGES b/CHANGES
index a7cda4d8a..099c752c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
 	hal, iconv, icu, libcgicc, libdvdnav, libdvdread, libglade,
 	libglib2, libgtk2, libidn, libmms, libmpd, libpcap, libsoup,
 	lmbench, lsof, ltrace, lvm2, make, metacity, mtd-utils, mutt,
-	nbd, netsnmp, ntfsprogs, ntp, pango, pciutils, pcmanfm, php,
-	pkg-config, psmisc, qt, samba, shared-mime-info, sshfs,
+	nbd, netsnmp, ntfsprogs, ntp, olsr, pango, pciutils, pcmanfm,
+	php, pkg-config, psmisc, qt, samba, shared-mime-info, sshfs,
 	startup-notification, swfdec, sylpheed, uemacs, util-linux,
 	vpnc, webkit, xstroke
 
diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index ca45f73bd..ada82b406 100644
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OLSR
 	bool "OLSR mesh networking Daemon"
+	depends on BR2_INET_IPV6
 	help
 	  The Optimized Link State Routing protocol (OLSR) is a
 	  routing protocol that is optimised for mobile ad-hoc
@@ -9,3 +10,6 @@ config BR2_PACKAGE_OLSR
 	  compute optimal forwarding paths locally.
 
 	  http://www.olsr.org/
+
+comment "olsr requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6