diff --git a/ChangeLog b/ChangeLog
index 9c2425401..3ff16a704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-05-31  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Headers/Additions/GNUstepGUI/GSTheme.h:
+        * Headers/AppKit/NSOpenPanel.h:
+        * Headers/AppKit/NSParagraphStyle.h:
+        * Headers/AppKit/NSText.h:
+        * Headers/AppKit/NSTextAttachment.h:
+        * Headers/AppKit/NSTextStorage.h:
+	Fixed faulty character encoding (should be utf-8) and a couple of
+	documentation markmup errors.
+
 2016-05-28 Eric Heintzmann <heintzmann.eric@free.fr> 
 
 	* ChangeLog.1:
@@ -63,7 +74,8 @@
 2016-03-21 Riccardo Mottola <rm@gnu.org>
 
 	* Source/NSImage.m
-	Actually allocate a NSMutableArray, since that is the expected return type.
+	Actually allocate a NSMutableArray, since that is the expected
+	return type.
 
 2016-03-10 Riccardo Mottola <rm@gnu.org>
 
@@ -157,8 +169,8 @@
 	* Images/nsmapping.strings
 	* Source/externs.m
 
-	Provide NSImageNameTrashEmpty NSImageNameTrashFull NSImageNameMultipleDocuments
-	image, both constants and actual icon.
+	Provide NSImageNameTrashEmpty NSImageNameTrashFull
+	NSImageNameMultipleDocuments images, both constants and actual icon.
 
 2015-11-12  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Headers/Additions/GNUstepGUI/GSTheme.h b/Headers/Additions/GNUstepGUI/GSTheme.h
index 28271d916..816768116 100644
--- a/Headers/Additions/GNUstepGUI/GSTheme.h
+++ b/Headers/Additions/GNUstepGUI/GSTheme.h
@@ -1057,8 +1057,10 @@ APPKIT_EXPORT	NSString	*GSThemeWillDeactivateNotification;
  *
  * <p>The title color is mapped to the theme state as described below:</p>
  * <deflist>
- * <item>GSThemeSelectedState</item><desc>[NSColor+selectedMenuItemTextColor]</desc>
- * <item>GSThemeDisabledState</item><desc>[NSColor+controlTextColor] or 
+ * <term>GSThemeSelectedState</term>
+ * <desc>[NSColor+selectedMenuItemTextColor]</desc>
+ * <term>GSThemeDisabledState</term>
+ * <desc>[NSColor+controlTextColor] or 
  * [NSColor+disabledControlTextColor]</desc>
  * </deflist>
  */
@@ -1080,7 +1082,8 @@ APPKIT_EXPORT	NSString	*GSThemeWillDeactivateNotification;
  */
 - (NSColor *) menuSeparatorColor;
 /**
- * <p>Returns the left and right inset used to draw a separator line in a menu.</p>
+ * <p>Returns the left and right inset used to draw a separator line in a
+ * menu.</p>
  *
  * <p>By default, returns 3.0.</p>
  *
@@ -1113,7 +1116,7 @@ APPKIT_EXPORT	NSString	*GSThemeWillDeactivateNotification;
  * -isSeparatorItem</p>
  *
  * <p>You can provide an image tile named <em>GSMenuSeparatorItem</em> to 
- * draw the separator.</br>
+ * draw the separator.<br />
  * Can be overridden in subclasses to customize the drawing.</p>
  *
  * <p>See also -menuSeparatorColor and -menuSeparatorInset</p>
diff --git a/Headers/AppKit/NSOpenPanel.h b/Headers/AppKit/NSOpenPanel.h
index 8638a9310..6fc6e4e41 100644
--- a/Headers/AppKit/NSOpenPanel.h
+++ b/Headers/AppKit/NSOpenPanel.h
@@ -7,9 +7,9 @@
 
    Author:  Scott Christley <scottc@net-community.com>
    Date: 1996
-   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
-   Source by Daniel Böhringer integrated into Scott Christley's preliminary
+   Source by Daniel Böhringer integrated into Scott Christley's preliminary
    implementation by Felipe A. Rodriguez <far@ix.netcom.com> 
 
    Author: Nicola Pero <n.pero@mi.flashnet.it>
diff --git a/Headers/AppKit/NSParagraphStyle.h b/Headers/AppKit/NSParagraphStyle.h
index 3cf8f353f..9c68b0159 100644
--- a/Headers/AppKit/NSParagraphStyle.h
+++ b/Headers/AppKit/NSParagraphStyle.h
@@ -6,7 +6,7 @@
 
    Copyright (C) 1996,1999 Free Software Foundation, Inc.
 
-   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
    Update: Richard Frith-Macdonald <richard@brainstorm.co.uk> March 1999 
    
diff --git a/Headers/AppKit/NSText.h b/Headers/AppKit/NSText.h
index da9ec97c3..4ecad44f7 100644
--- a/Headers/AppKit/NSText.h
+++ b/Headers/AppKit/NSText.h
@@ -9,7 +9,7 @@
    Date: 1996
    Author: Felipe A. Rodriguez <far@ix.netcom.com>
    Date: July 1998
-   Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
    Author: Nicola Pero <n.pero@mi.flashnet.it>
    Date: December 2000
diff --git a/Headers/AppKit/NSTextAttachment.h b/Headers/AppKit/NSTextAttachment.h
index 2c6e15686..2df50f34b 100644
--- a/Headers/AppKit/NSTextAttachment.h
+++ b/Headers/AppKit/NSTextAttachment.h
@@ -5,9 +5,9 @@
    
    Copyright (C) 1996 Free Software Foundation, Inc.
 
-   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
-   Source by Daniel Böhringer integrated into GNUstep gui
+   Source by Daniel Böhringer integrated into GNUstep gui
    by Felipe A. Rodriguez <far@ix.netcom.com> 
    
    This file is part of the GNUstep GUI Library.
diff --git a/Headers/AppKit/NSTextStorage.h b/Headers/AppKit/NSTextStorage.h
index 64ae61d2b..243a60cd7 100644
--- a/Headers/AppKit/NSTextStorage.h
+++ b/Headers/AppKit/NSTextStorage.h
@@ -3,9 +3,9 @@
 
    Copyright (C) 1996,1999 Free Software Foundation, Inc.
 
-   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
+   Author:  Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
    Date: August 1998
-   Source by Daniel Böhringer integrated into GNUstep gui
+   Source by Daniel Böhringer integrated into GNUstep gui
    by Felipe A. Rodriguez <far@ix.netcom.com> 
    Update: Richard Frith-Macdonald <richard@brainstorm.co.uk>