diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 8560cb9279..a3554bce89 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libnetworking/sys/linker_set.h: Add local versions of __used
+	and __CONCAT macros.
+
 2011-03-18	Jennifer Averett <Jennifer.Averett@OARcorp.com>
 
 	* score/src/percpu.c: All possible cpus must be
diff --git a/cpukit/libnetworking/sys/linker_set.h b/cpukit/libnetworking/sys/linker_set.h
index a2354ed397..c83d7c845a 100644
--- a/cpukit/libnetworking/sys/linker_set.h
+++ b/cpukit/libnetworking/sys/linker_set.h
@@ -30,6 +30,22 @@
 #ifndef _SYS_LINKER_SET_H_
 #define _SYS_LINKER_SET_H_
 
+/* FIXME: These macros should not be here
+ * BSD has them macros in sys/cdefs.h
+ * older rtems had them in rtems/bsd/sys/cdefs.h
+ * newlib has some of them in sys/cdefs.h
+ */
+
+#if defined(__rtems__)
+#ifndef	__used
+#define	__used		__attribute__((__used__))
+#endif
+#ifndef __CONCAT
+#define	__CONCAT1(x,y)	x ## y
+#define	__CONCAT(x,y)	__CONCAT1(x,y)
+#endif
+#endif
+
 /*
  * The following macros are used to declare global sets of objects, which
  * are collected by the linker into a `linker_set' as defined below.