diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index c014efd53..1a857b6d3 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23  Jon Turney  <jon.turney@dronecode.org.uk>
+
+	* libc/signal/signal.tex: Use texinfo not makedoc markup.
+	* libc/stdio/stdio.tex: Ditto.
+
 2015-06-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/include/sys/signal.h: Include forgotten sys/cdefs.h.
diff --git a/newlib/libc/signal/signal.tex b/newlib/libc/signal/signal.tex
index b36deb968..c4d48308f 100644
--- a/newlib/libc/signal/signal.tex
+++ b/newlib/libc/signal/signal.tex
@@ -10,7 +10,7 @@ error message and aborting your program, or ignoring the signal.
 All systems support at least the following signals:
 @table @code
 @item SIGABRT
-Abnormal termination of a program; raised by the <<abort>> function.
+Abnormal termination of a program; raised by the @code{abort} function.
 
 @item SIGFPE
 A domain error in arithmetic, such as overflow, or division by zero.
diff --git a/newlib/libc/stdio/stdio.tex b/newlib/libc/stdio/stdio.tex
index 363efd48d..5352c5491 100644
--- a/newlib/libc/stdio/stdio.tex
+++ b/newlib/libc/stdio/stdio.tex
@@ -20,7 +20,7 @@ _stderr_r(@var{reent})
 
 @noindent
 instead of the globals @code{stdin}, @code{stdout}, and
-@code{stderr}.  The argument <[reent]> is a pointer to a reentrancy
+@code{stderr}.  The argument @var{reent} is a pointer to a reentrancy
 structure.
 
 @menu