diff --git a/ChangeLog b/ChangeLog
index bb1f480c..d567761c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+06 Feb 1999
+- adjusting geometry save/restore
 03 Feb 1999
 - fixed -caption
 - some adjustments in geometry management
diff --git a/include/main.h b/include/main.h
index 644ca158..fca15a64 100644
--- a/include/main.h
+++ b/include/main.h
@@ -19,6 +19,7 @@
 #include <kfm.h>
 #include <kapp.h>
 #include <ktmainwindow.h>
+//#include <ktopwidget.h>
 #include <ksimpleconfig.h>
 #include <qstrlist.h>
 
@@ -68,7 +69,7 @@ protected:
 private slots:
 
   void setSchema(int n);
-  void saveYourself();
+//  void saveYourself();
 
 private:
 
diff --git a/src/main.C b/src/main.C
index 261858bc..b572211f 100644
--- a/src/main.C
+++ b/src/main.C
@@ -387,13 +387,11 @@ void TEDemo::makeMenu()
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
-void TEDemo::saveYourself()
-{
-    KConfig* config = kapp->getSessionConfig();
-    if (args.count() > 0)
-        config->writeEntry("konsolearguments", args);
-    config->sync();
-}
+//void TEDemo::saveYourself()
+//{
+//    KConfig* config = kapp->getSessionConfig();
+//    config->sync();
+//}
 
 void TEDemo::saveProperties(KConfig* config)
 {
@@ -404,21 +402,16 @@ void TEDemo::saveProperties(KConfig* config)
   config->writeEntry("font",n_font);
   config->writeEntry("schema",s_schema);
   config->writeEntry("scrollbar",n_scroll);
-  config->writeEntry("geometry", geometry()); //FIXME: we get wrong geometry info here
-                                              //NOTE : I first thought that
-                                              //       problem depends on my
-                                              //       strange configuration.
-                                              //       I'm running a borderless
-                                              //       konsole in MacOS style.
-                                              //       But it doesn't.
-  config->writeEntry("kmenubar",
+  if (args.count() > 0) config->writeEntry("konsolearguments", args);
+  config->writeEntry("geometry", KWM::getProperties(winId()));
+  config->writeEntry("kmenubar", //FIXME:Float
                      menubar->menuBarPos() == KMenuBar::Bottom ? "bottom" : "top");
   config->sync();
 }
 
 void TEDemo::readProperties(KConfig* config)
 {
-  QRect dftRect = geometry();
+  QString dftGeom = "1+4+0+512+307+4+0+512+307+0+0+0+1"; //FIXME: implementation
   config->setGroup("options"); // bad! will no allow us to support multi windows
   b_menuvis  = config->readBoolEntry("menubar visible",TRUE);
   b_framevis = config->readBoolEntry("has frame",TRUE);
@@ -426,8 +419,7 @@ void TEDemo::readProperties(KConfig* config)
   n_font     = MIN(config->readUnsignedNumEntry("font",3),7);
   n_scroll   = MIN(config->readUnsignedNumEntry("scrollbar",SCRRIGHT),2);
   s_schema   = config->readEntry("schema","");
-  setGeometry(config->readRectEntry("geometry",&dftRect));
-//move(+4,-5); //FIXME: we work around a KWM(?) bug here. (see geometry() above)
+  setGeometry(KWM::setProperties(menubar->winId(), config->readEntry("geometry",dftGeom)));
   if (menubar->menuBarPos() != KMenuBar::Floating)
   { QString entry = config->readEntry("kmenubar");
     if (!entry.isEmpty() && entry == "floating")