diff --git a/ChangeLog b/ChangeLog
index 487b1d374..547474a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2015-11-02  Jon Turney  <jon.turney@dronecode.org.uk>
-
-	* libc/stdio/fseek.c: Add missing semicolons to prototypes in
-	SYNOPSIS.
-	* libc/stdio/fwide.c: Ditto.
-	* libc/stdio64/fseeko64.c: Ditto.
-	* libc/string/strtok.c: Ditto.
-	* libc/string/wcstok.c: Ditto.
-	* libm/math/w_cosh.c: Ditto.
-	* libm/math/w_fmod.c:  Ditto.
-	* libm/mathfp/s_cosh.c: Ditto.
-	* libm/mathfp/s_fmod.c: Ditto.
-
 2015-09-22  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.guess: Update from config repo.
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d46870b7f..cb87b2c2f 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,41 @@
+2015-11-02  Jon Turney  <jon.turney@dronecode.org.uk>
+
+        * libc/time/wcsftime.c: Consistently use an em-dash in FUNCTION
+summary.
+        * libm/common/isgreater.c: Ditto.
+        * libm/common/s_fdim.c: Ditto.
+        * libm/common/s_fma.c: Ditto.
+        * libm/common/s_fmax.c: Ditto.
+        * libm/common/s_fmin.c: Ditto.
+        * libm/common/s_infinity.c: Ditto.
+        * libm/common/s_isnan.c: Ditto.
+        * libm/common/s_log2.c: Ditto.
+        * libm/common/s_logb.c: Ditto.
+        * libm/common/s_lrint.c: Ditto.
+        * libm/common/s_lround.c: Ditto.
+        * libm/common/s_nearbyint.c: Ditto.
+        * libm/common/s_remquo.c: Ditto.
+        * libm/common/s_rint.c: Ditto.
+        * libm/common/s_round.c: Ditto.
+        * libm/common/s_scalbn.c: Ditto.
+        * libm/common/s_signbit.c: Ditto.
+        * libm/common/s_trunc.c: Ditto.
+        * libm/math/w_exp2.c: Ditto.
+        * libm/math/w_gamma.c: Ditto.
+
+2015-11-02  Jon Turney  <jon.turney@dronecode.org.uk>
+
+        * libc/stdio/fseek.c: Add missing semicolons to prototypes in
+        SYNOPSIS.
+        * libc/stdio/fwide.c: Ditto.
+        * libc/stdio64/fseeko64.c: Ditto.
+        * libc/string/strtok.c: Ditto.
+        * libc/string/wcstok.c: Ditto.
+        * libm/math/w_cosh.c: Ditto.
+        * libm/math/w_fmod.c:  Ditto.
+        * libm/mathfp/s_cosh.c: Ditto.
+        * libm/mathfp/s_fmod.c: Ditto.
+
 2015-11-02  Steve Ellcey  <sellcey@imgtec.com>
 
 	* libc/machine/mips/memcpy.S (memcpy): Add word copies for small
diff --git a/newlib/libc/time/wcsftime.c b/newlib/libc/time/wcsftime.c
index ac71a0941..f77b3d07f 100644
--- a/newlib/libc/time/wcsftime.c
+++ b/newlib/libc/time/wcsftime.c
@@ -8,7 +8,7 @@
 
 /*
 FUNCTION
-<<wcsftime>>--convert date and time to a formatted wide-character string
+<<wcsftime>>---convert date and time to a formatted wide-character string
 
 INDEX
 	wcsftime
diff --git a/newlib/libm/common/isgreater.c b/newlib/libm/common/isgreater.c
index bd4e95e05..54a8e6d42 100644
--- a/newlib/libm/common/isgreater.c
+++ b/newlib/libm/common/isgreater.c
@@ -3,7 +3,7 @@
  * defined in math.h (q.v.).  */
 /*
 FUNCTION
-<<isgreater>>, <<isgreaterequal>>, <<isless>>, <<islessequal>>, <<islessgreater>>, and <<isunordered>>--comparison macros
+<<isgreater>>, <<isgreaterequal>>, <<isless>>, <<islessequal>>, <<islessgreater>>, and <<isunordered>>---comparison macros
 INDEX
 	isgreater
 INDEX
diff --git a/newlib/libm/common/s_fdim.c b/newlib/libm/common/s_fdim.c
index 8eb878209..a6c465cc4 100644
--- a/newlib/libm/common/s_fdim.c
+++ b/newlib/libm/common/s_fdim.c
@@ -5,7 +5,7 @@
  */
 /*
 FUNCTION
-<<fdim>>, <<fdimf>>--positive difference
+<<fdim>>, <<fdimf>>---positive difference
 INDEX
 	fdim
 INDEX
diff --git a/newlib/libm/common/s_fma.c b/newlib/libm/common/s_fma.c
index 964a8284a..bbb3eb09b 100644
--- a/newlib/libm/common/s_fma.c
+++ b/newlib/libm/common/s_fma.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<fma>>, <<fmaf>>--floating multiply add
+<<fma>>, <<fmaf>>---floating multiply add
 INDEX
 	fma
 INDEX
diff --git a/newlib/libm/common/s_fmax.c b/newlib/libm/common/s_fmax.c
index 4003f9a34..8f446e216 100644
--- a/newlib/libm/common/s_fmax.c
+++ b/newlib/libm/common/s_fmax.c
@@ -5,7 +5,7 @@
  */
 /*
 FUNCTION
-<<fmax>>, <<fmaxf>>--maximum
+<<fmax>>, <<fmaxf>>---maximum
 INDEX
 	fmax
 INDEX
diff --git a/newlib/libm/common/s_fmin.c b/newlib/libm/common/s_fmin.c
index 2a059209c..2d0cd8021 100644
--- a/newlib/libm/common/s_fmin.c
+++ b/newlib/libm/common/s_fmin.c
@@ -5,7 +5,7 @@
  */
 /*
 FUNCTION
-<<fmin>>, <<fminf>>--minimum
+<<fmin>>, <<fminf>>---minimum
 INDEX
 	fmin
 INDEX
diff --git a/newlib/libm/common/s_infinity.c b/newlib/libm/common/s_infinity.c
index 02a545edb..9285a762f 100644
--- a/newlib/libm/common/s_infinity.c
+++ b/newlib/libm/common/s_infinity.c
@@ -5,7 +5,7 @@
 
 /*
 FUNCTION
-	<<infinity>>, <<infinityf>>--representation of infinity
+	<<infinity>>, <<infinityf>>---representation of infinity
 
 INDEX
 	infinity
diff --git a/newlib/libm/common/s_isnan.c b/newlib/libm/common/s_isnan.c
index 5ae6c9b81..3ce5aa669 100644
--- a/newlib/libm/common/s_isnan.c
+++ b/newlib/libm/common/s_isnan.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<fpclassify>>, <<isfinite>>, <<isinf>>, <<isnan>>, and <<isnormal>>--floating-point classification macros; <<finite>>, <<finitef>>, <<isinf>>, <<isinff>>, <<isnan>>, <<isnanf>>--test for exceptional numbers
+<<fpclassify>>, <<isfinite>>, <<isinf>>, <<isnan>>, and <<isnormal>>---floating-point classification macros; <<finite>>, <<finitef>>, <<isinf>>, <<isinff>>, <<isnan>>, <<isnanf>>---test for exceptional numbers
 
 @c C99 (start
 INDEX
diff --git a/newlib/libm/common/s_log2.c b/newlib/libm/common/s_log2.c
index e5087858b..3b05066b1 100644
--- a/newlib/libm/common/s_log2.c
+++ b/newlib/libm/common/s_log2.c
@@ -14,7 +14,7 @@
 
 /*
 FUNCTION
-	<<log2>>, <<log2f>>--base 2 logarithm
+	<<log2>>, <<log2f>>---base 2 logarithm
 INDEX
 	log2
 INDEX
diff --git a/newlib/libm/common/s_logb.c b/newlib/libm/common/s_logb.c
index 1be4cddb3..7e71457a5 100644
--- a/newlib/libm/common/s_logb.c
+++ b/newlib/libm/common/s_logb.c
@@ -12,7 +12,7 @@
  */
 /*
 FUNCTION
-       <<logb>>, <<logbf>>--get exponent of floating-point number
+       <<logb>>, <<logbf>>---get exponent of floating-point number
 INDEX
 	logb
 INDEX
diff --git a/newlib/libm/common/s_lrint.c b/newlib/libm/common/s_lrint.c
index cf35dcfbd..52bb52292 100644
--- a/newlib/libm/common/s_lrint.c
+++ b/newlib/libm/common/s_lrint.c
@@ -12,7 +12,7 @@
  */
 /*
 FUNCTION
-<<lrint>>, <<lrintf>>, <<llrint>>, <<llrintf>>--round to integer
+<<lrint>>, <<lrintf>>, <<llrint>>, <<llrintf>>---round to integer
 INDEX
 	lrint
 INDEX
diff --git a/newlib/libm/common/s_lround.c b/newlib/libm/common/s_lround.c
index 7c1eb3144..52cd74f16 100644
--- a/newlib/libm/common/s_lround.c
+++ b/newlib/libm/common/s_lround.c
@@ -10,7 +10,7 @@
  */
 /*
 FUNCTION
-<<lround>>, <<lroundf>>, <<llround>>, <<llroundf>>--round to integer, to nearest
+<<lround>>, <<lroundf>>, <<llround>>, <<llroundf>>---round to integer, to nearest
 INDEX
 	lround
 INDEX
diff --git a/newlib/libm/common/s_nearbyint.c b/newlib/libm/common/s_nearbyint.c
index e7a022072..714b66a5c 100644
--- a/newlib/libm/common/s_nearbyint.c
+++ b/newlib/libm/common/s_nearbyint.c
@@ -10,7 +10,7 @@
  */
 /*
 FUNCTION
-<<nearbyint>>, <<nearbyintf>>--round to integer
+<<nearbyint>>, <<nearbyintf>>---round to integer
 INDEX
 	nearbyint
 INDEX
diff --git a/newlib/libm/common/s_remquo.c b/newlib/libm/common/s_remquo.c
index 8ae287575..30bf15f14 100644
--- a/newlib/libm/common/s_remquo.c
+++ b/newlib/libm/common/s_remquo.c
@@ -13,7 +13,7 @@
  */
 /*
 FUNCTION
-<<remquo>>, <<remquof>>--remainder and part of quotient
+<<remquo>>, <<remquof>>---remainder and part of quotient
 INDEX
 	remquo
 INDEX
diff --git a/newlib/libm/common/s_rint.c b/newlib/libm/common/s_rint.c
index 76cff08a1..f06325a8d 100644
--- a/newlib/libm/common/s_rint.c
+++ b/newlib/libm/common/s_rint.c
@@ -12,7 +12,7 @@
  */
 /*
 FUNCTION
-<<rint>>, <<rintf>>--round to integer
+<<rint>>, <<rintf>>---round to integer
 INDEX
 	rint
 INDEX
diff --git a/newlib/libm/common/s_round.c b/newlib/libm/common/s_round.c
index b2cc0f558..07aac9ecf 100644
--- a/newlib/libm/common/s_round.c
+++ b/newlib/libm/common/s_round.c
@@ -10,7 +10,7 @@
  */
 /*
 FUNCTION
-<<round>>, <<roundf>>--round to integer, to nearest
+<<round>>, <<roundf>>---round to integer, to nearest
 INDEX
 	round
 INDEX
diff --git a/newlib/libm/common/s_scalbn.c b/newlib/libm/common/s_scalbn.c
index 50f20efec..7fab5861f 100644
--- a/newlib/libm/common/s_scalbn.c
+++ b/newlib/libm/common/s_scalbn.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<scalbn>>, <<scalbnf>>, <<scalbln>>, <<scalblnf>>--scale by power of FLT_RADIX (=2)
+<<scalbn>>, <<scalbnf>>, <<scalbln>>, <<scalblnf>>---scale by power of FLT_RADIX (=2)
 INDEX
 	scalbn
 INDEX
diff --git a/newlib/libm/common/s_signbit.c b/newlib/libm/common/s_signbit.c
index 6ea714dd3..d2ba1fcb9 100644
--- a/newlib/libm/common/s_signbit.c
+++ b/newlib/libm/common/s_signbit.c
@@ -5,7 +5,7 @@
  */
 /*
 FUNCTION
-<<signbit>>--Does floating-point number have negative sign?
+<<signbit>>---Does floating-point number have negative sign?
 
 INDEX
 	signbit
diff --git a/newlib/libm/common/s_trunc.c b/newlib/libm/common/s_trunc.c
index daeb7910a..31a1f92b9 100644
--- a/newlib/libm/common/s_trunc.c
+++ b/newlib/libm/common/s_trunc.c
@@ -10,7 +10,7 @@
  */
 /*
 FUNCTION
-<<trunc>>, <<truncf>>--round to integer, towards zero
+<<trunc>>, <<truncf>>---round to integer, towards zero
 INDEX
 	trunc
 INDEX
diff --git a/newlib/libm/math/w_exp2.c b/newlib/libm/math/w_exp2.c
index efb676df1..857cb0cdc 100644
--- a/newlib/libm/math/w_exp2.c
+++ b/newlib/libm/math/w_exp2.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-	<<exp2>>, <<exp2f>>--exponential, base 2
+	<<exp2>>, <<exp2f>>---exponential, base 2
 INDEX
 	exp2
 INDEX
diff --git a/newlib/libm/math/w_gamma.c b/newlib/libm/math/w_gamma.c
index 3717f53e5..d1a70df2f 100644
--- a/newlib/libm/math/w_gamma.c
+++ b/newlib/libm/math/w_gamma.c
@@ -24,7 +24,7 @@ gamma function.
 matching a newer, better definition.  */
 /*
 FUNCTION
-        <<gamma>>, <<gammaf>>, <<lgamma>>, <<lgammaf>>, <<gamma_r>>, <<gammaf_r>>, <<lgamma_r>>, <<lgammaf_r>>, <<tgamma>>, and <<tgammaf>>--logarithmic and plain gamma functions
+        <<gamma>>, <<gammaf>>, <<lgamma>>, <<lgammaf>>, <<gamma_r>>, <<gammaf_r>>, <<lgamma_r>>, <<lgammaf_r>>, <<tgamma>>, and <<tgammaf>>---logarithmic and plain gamma functions
 
 INDEX
 gamma