diff --git a/ChangeLog b/ChangeLog
index 85e07fae11..ce8e47b95c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/gnu/net/if.h (IFF_DYNAMIC): New macro.
+
 2006-02-24  David S. Miller  <davem@sunset.davemloft.net>
 
 	* configure.in: Use sparc/sparc32/sparcv9/sparcv9b in place
diff --git a/libidn/ChangeLog b/libidn/ChangeLog
index f9303743fc..28dda534eb 100644
--- a/libidn/ChangeLog
+++ b/libidn/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-25  Roland McGrath  <roland@redhat.com>
+
+	* configure.in: New file.
+	* configure: Replaced with generated file.
+	* sysdeps/unix/configure: File removed.
+
 2005-03-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* iconvme.c (SIZE_MAX): New macro, if not already defined.
diff --git a/libidn/configure b/libidn/configure
index 53d0dcd67e..52ddb3fc26 100644
--- a/libidn/configure
+++ b/libidn/configure
@@ -1,3 +1,7 @@
-# This is only to keep the GNU C library configure mechanism happy.
-# This is a shell script fragment sourced by the main configure script.
-# We have nothing we need to add here.
+# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+
+# Get this defined in config.h for main source code to test.
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBIDN 1
+_ACEOF
+
diff --git a/libidn/configure.in b/libidn/configure.in
new file mode 100644
index 0000000000..bafa3555ef
--- /dev/null
+++ b/libidn/configure.in
@@ -0,0 +1,5 @@
+dnl glibc configure fragment for libidn add-on
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+
+# Get this defined in config.h for main source code to test.
+AC_DEFINE([HAVE_LIBIDN])
diff --git a/libidn/sysdeps/unix/configure b/libidn/sysdeps/unix/configure
deleted file mode 100755
index 2d9fac30e5..0000000000
--- a/libidn/sysdeps/unix/configure
+++ /dev/null
@@ -1,2 +0,0 @@
-# Signal that libidn is available.
-libc_cv_idn=yes
diff --git a/sysdeps/gnu/net/if.h b/sysdeps/gnu/net/if.h
index b10245f455..ebb3e9f306 100644
--- a/sysdeps/gnu/net/if.h
+++ b/sysdeps/gnu/net/if.h
@@ -75,8 +75,10 @@ enum
 
     IFF_PORTSEL = 0x2000,	/* Can set media type.  */
 # define IFF_PORTSEL	IFF_PORTSEL
-    IFF_AUTOMEDIA = 0x4000	/* Auto media select active.  */
+    IFF_AUTOMEDIA = 0x4000,	/* Auto media select active.  */
 # define IFF_AUTOMEDIA	IFF_AUTOMEDIA
+    IFF_DYNAMIC = 0x8000	/* Dialup device with changing addresses.  */
+# define IFF_DYNAMIC	IFF_DYNAMIC
   };
 
 /* The ifaddr structure contains information about one address of an