diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 31caf9a8a..e1af1bda3 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Shaun Jackman  <sjackman@gmail.com>
+
+	* libc/unix/sigset.c: Undefine sigfillset, sigdelset, and
+	sigismember.
+
 2006-05-23  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/misc/dprintf.c: Removed.
diff --git a/newlib/libc/unix/sigset.c b/newlib/libc/unix/sigset.c
index cd73a78c8..867fb94c3 100644
--- a/newlib/libc/unix/sigset.c
+++ b/newlib/libc/unix/sigset.c
@@ -11,6 +11,7 @@ sigemptyset (sigset_t * set)
   return 0;
 }
 
+#undef sigfillset
 int
 sigfillset (sigset_t * set)
 {
@@ -31,6 +32,7 @@ sigaddset (sigset_t * set, int signo)
   return 0;
 }
 
+#undef sigdelset
 int
 sigdelset (sigset_t * set, int signo)
 {
@@ -43,6 +45,7 @@ sigdelset (sigset_t * set, int signo)
   return 0;
 }
 
+#undef sigismember
 int
 sigismember (const sigset_t * set, int signo)
 {