diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b0d12cf52..cf840ee35 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/wordexp.h: Add __cplusplus wrapper.
+
 2010-06-08  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* configure.in: Add test for enable-newlib-register-fini
diff --git a/newlib/libc/include/wordexp.h b/newlib/libc/include/wordexp.h
index aede5ad47..8f87681a9 100644
--- a/newlib/libc/include/wordexp.h
+++ b/newlib/libc/include/wordexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
+/* Copyright (C) 2002, 2010 by  Red Hat, Incorporated. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
@@ -9,6 +9,10 @@
 
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct _wordexp_t
 {
   size_t we_wordc;	/* Count of words matched by words. */
@@ -42,4 +46,8 @@ enum {
 int wordexp(const char *, wordexp_t *, int);
 void wordfree(wordexp_t *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _WORDEXP_H_  */