diff --git a/ChangeLog b/ChangeLog
index 0a647fe95..3a64a8090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11  Georg Fleischmann
+	
+	* Model/GMAppKit.m [-encodeWithModelArchiver:] remove title
+	  bar and resize bar from 'minSize'.
+
 2004-10-15 07:33  Matt Rice <ratmice@yahoo.com>
 
 	* Source/NSApplication.m ([NSAppIconView -mouseDown:]): order front
diff --git a/Model/GMAppKit.m b/Model/GMAppKit.m
index da062d5b9..d5d822f56 100644
--- a/Model/GMAppKit.m
+++ b/Model/GMAppKit.m
@@ -1224,14 +1224,20 @@ void __dummy_GMAppKit_functionForLinking() {}
 - (void)encodeWithModelArchiver:(GMArchiver*)archiver
 {
   NSPoint wnOrigin = [self frame].origin;
-  NSRect ctFrame = [[self contentView] frame];
+  NSRect ctFrame = [[self contentView] frame], minRect;
   unsigned int style;
 
   ctFrame.origin = wnOrigin;
 
+  /* convert minSize to GNUstep frame (without title bar and resize bar) */
+  minRect.origin = wnOrigin;
+  minRect.size = [self minSize];
+  minRect = [NSWindow contentRectForFrameRect:minRect
+                                    styleMask:[self styleMask]];
+
   [archiver encodeRect:ctFrame withName:@"contentFrame"];
   [archiver encodeSize:[self maxSize] withName:@"maxSize"];
-  [archiver encodeSize:[self minSize] withName:@"minSize"];
+  [archiver encodeSize:minRect.size withName:@"minSize"];
   [archiver encodeString:[self frameAutosaveName]
 	    withName:@"frameAutosaveName"];
   [archiver encodeInt:[self level] withName:@"level"];