diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 37a4b5ae00..37c38e5c5d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-04	Keith Robertson <kjrobert@alumni.uwaterloo.ca>,
+	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libnetworking/ifaddrs.h, libnetworking/libc/getifaddrs.c,
+	libnetworking/libc/if_indextoname.c,
+	libnetworking/libc/if_nameindex.c: New (from FreeBSD)
+	* Makefile.am: Add files above.
+	* libnetworking/net/if.h: Add if_nameindex (from FreeBSD).
+
 2007-09-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libmisc/stackchk/check.c: Eliminate output with little information.
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 9042b3139b..5b9ecfffd4 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -152,6 +152,8 @@ libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE
 noinst_LIBRARIES += libc.a
 libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(libc_CPPFLAGS)
 
+include_HEADERS += ifaddrs.h
+
 libc_a_SOURCES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \
     libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \
     libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \
@@ -168,6 +170,9 @@ libc_a_SOURCES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \
 libc_a_SOURCES += libc/res_config.h
 libc_a_SOURCES += libc/send.c
 libc_a_SOURCES += libc/recv.c
+libc_a_SOURCES += libc/getifaddrs.c
+libc_a_SOURCES += libc/if_indextoname.c
+libc_a_SOURCES += libc/if_nameindex.c
 endif
 
 UNUSED_FILES += libc/ether_addr.c libc/gethostname.c libc/inet_neta.c \