diff --git a/ChangeLog b/ChangeLog
index 6b28acfb3..6795d0c40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-31 23:20  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/GSLayoutManager.m (-_generateGlyphsForRun:at:): Add
+	handling of NSAttachmentCharacter.
+
 2003-01-31 21:59  Alexander Malmberg <alexander@malmberg.org>
 
 	* Headers/gnustep/gui/GSLayoutManager.h,
diff --git a/Source/GSLayoutManager.m b/Source/GSLayoutManager.m
index 53bbd7f15..967034869 100644
--- a/Source/GSLayoutManager.m
+++ b/Source/GSLayoutManager.m
@@ -24,15 +24,18 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "AppKit/GSLayoutManager_internal.h"
+#include <AppKit/GSLayoutManager_internal.h>
 
 #include <Foundation/NSCharacterSet.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSValue.h>
 
-#include "AppKit/GSTypesetter.h"
-#include "AppKit/NSTextStorage.h"
-#include "AppKit/NSTextContainer.h"
+#include <AppKit/GSTypesetter.h>
+#include <AppKit/NSTextStorage.h>
+#include <AppKit/NSTextContainer.h>
+
+/* just for NSAttachmentCharacter */
+#include <AppKit/NSTextAttachment.h>
 
 
 
@@ -2248,6 +2251,8 @@ for the backends to use it */
       g->char_offset = i;
       if (characterIsMember(cs, @selector(characterIsMember:), ch))
 	g->g = NSControlGlyph;
+      else if (ch == NSAttachmentCharacter)
+	g->g = GSAttachmentGlyph;
       else
 	g->g = ch;
       g++;