diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fd98f5deb..f204e61a7 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/stdio.h: Protect dprintf prototype
+	with #ifndef dprintf so as to not interfere with
+	historical code defining their own dprintf macro.
+
 2006-05-18  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/include/stdio.h: Add prototypes for fiscanf,
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 7f1652768..5fc2f4bfd 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -229,7 +229,9 @@ off_t	_EXFUN(ftello, ( FILE *));
 #ifndef _REENT_ONLY
 int	_EXFUN(asiprintf, (char **, const char *, ...));
 int	_EXFUN(asprintf, (char **, const char *, ...));
+#ifndef dprintf
 int	_EXFUN(dprintf, (int, const char *, ...));
+#endif
 int	_EXFUN(fcloseall, (_VOID));
 int	_EXFUN(fiprintf, (FILE *, const char *, ...));
 int	_EXFUN(fiscanf, (FILE *, const char *, ...));