diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am
index 9b190df3e6..7e41fce2b3 100644
--- a/c/src/libnetworking/Makefile.am
+++ b/c/src/libnetworking/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \
     rtems_servers pppd rtems_webserver wrapup
 
 EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \
-    opt_tcpdebug.h poll.h resolv.h syslog.h
+    opt_tcpdebug.h poll.h resolv.h syslog.h memory.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/include/Makefile.am b/c/src/libnetworking/include/Makefile.am
index c108fd99b0..aac9766ccd 100644
--- a/c/src/libnetworking/include/Makefile.am
+++ b/c/src/libnetworking/include/Makefile.am
@@ -8,7 +8,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = ../bpfilter.h ../loop.h ../netdb.h ../opt_ipfw.h ../opt_mrouting.h \
-    ../opt_tcpdebug.h ../poll.h ../resolv.h ../syslog.h
+    ../opt_tcpdebug.h ../poll.h ../resolv.h ../syslog.h ../memory.h
 
 SYS_H_FILES = ../sys/buf.h ../sys/callout.h ../sys/cdefs.h ../sys/conf.h \
     ../sys/domain.h ../sys/filio.h ../sys/ioccom.h ../sys/ioctl.h \
@@ -18,7 +18,7 @@ SYS_H_FILES = ../sys/buf.h ../sys/callout.h ../sys/cdefs.h ../sys/conf.h \
     ../sys/select.h ../sys/signalvar.h ../sys/socket.h ../sys/socketvar.h \
     ../sys/sockio.h ../sys/sysctl.h ../sys/syslimits.h ../sys/syslog.h \
     ../sys/systm.h ../sys/ttycom.h ../sys/ttydefaults.h ../sys/ucred.h \
-    ../sys/uio.h
+    ../sys/uio.h ../sys/un.h
 
 RTEMS_H_FILES = ../rtems/rtems_bsdnet.h ../rtems/rtems_bsdnet_internal.h \
     ../rtems/tftp.h
@@ -90,6 +90,9 @@ $(PROJECT_INCLUDE)/resolv.h: ../resolv.h
 $(PROJECT_INCLUDE)/syslog.h: ../syslog.h
 	$(INSTALL_DATA) $< $@
 
+$(PROJECT_INCLUDE)/memory.h: ../memory.h
+	$(INSTALL_DATA) $< $@
+
 $(PROJECT_INCLUDE)/sys/buf.h: ../sys/buf.h
 	$(INSTALL_DATA) $< $@
 
@@ -189,6 +192,9 @@ $(PROJECT_INCLUDE)/sys/ucred.h: ../sys/ucred.h
 $(PROJECT_INCLUDE)/sys/uio.h: ../sys/uio.h
 	$(INSTALL_DATA) $< $@
 
+$(PROJECT_INCLUDE)/sys/un.h: ../sys/un.h
+	$(INSTALL_DATA) $< $@
+
 $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: ../rtems/rtems_bsdnet.h
 	$(INSTALL_DATA) $< $@
 
@@ -390,6 +396,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bpfilter.h \
     $(PROJECT_INCLUDE)/opt_ipfw.h $(PROJECT_INCLUDE)/opt_mrouting.h \
     $(PROJECT_INCLUDE)/opt_tcpdebug.h $(PROJECT_INCLUDE)/poll.h \
     $(PROJECT_INCLUDE)/resolv.h $(PROJECT_INCLUDE)/syslog.h \
+    $(PROJECT_INCLUDE)/memory.h \
     $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/sys/buf.h \
     $(PROJECT_INCLUDE)/sys/callout.h $(PROJECT_INCLUDE)/sys/cdefs.h \
     $(PROJECT_INCLUDE)/sys/conf.h $(PROJECT_INCLUDE)/sys/domain.h \
@@ -407,6 +414,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bpfilter.h \
     $(PROJECT_INCLUDE)/sys/syslog.h $(PROJECT_INCLUDE)/sys/systm.h \
     $(PROJECT_INCLUDE)/sys/ttycom.h $(PROJECT_INCLUDE)/sys/ttydefaults.h \
     $(PROJECT_INCLUDE)/sys/ucred.h $(PROJECT_INCLUDE)/sys/uio.h \
+    $(PROJECT_INCLUDE)/sys/un.h \
     $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h \
     $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h \
     $(PROJECT_INCLUDE)/rtems/tftp.h $(PROJECT_INCLUDE)/machine \
diff --git a/c/src/libnetworking/netinet/in.h b/c/src/libnetworking/netinet/in.h
index ba3cbb21cc..36d2d4e867 100644
--- a/c/src/libnetworking/netinet/in.h
+++ b/c/src/libnetworking/netinet/in.h
@@ -255,6 +255,9 @@ struct in_addr {
 #define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
 
 #define	IN_LOOPBACKNET		127			/* official! */
+#ifndef INADDR_LOOPBACK
+#define	INADDR_LOOPBACK		(u_long)0x7F000001	/* 127.0.0.1 */
+#endif
 
 /*
  * Socket address, internet style.
diff --git a/c/src/libnetworking/sys/Makefile.am b/c/src/libnetworking/sys/Makefile.am
index 3fe88aff59..4614b5be90 100644
--- a/c/src/libnetworking/sys/Makefile.am
+++ b/c/src/libnetworking/sys/Makefile.am
@@ -8,6 +8,6 @@ EXTRA_DIST = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \
     socket.h socketvar.h sockio.h sysctl.h syslimits.h syslog.h systm.h \
-    ttycom.h ttydefaults.h ucred.h uio.h
+    ttycom.h ttydefaults.h ucred.h uio.h un.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index db8408958c..4c6d14a014 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -13,7 +13,8 @@ LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
 
 if HAS_NETWORKING
 LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \
-    $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a
+    $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a \
+    $(PROJECT_RELEASE)/lib/libxdr$(LIB_VARIANT).a
 endif
 
 if HAS_RDBG