diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index a078778666..e16ec339ba 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -29,10 +29,10 @@ int main( int argc, char* argv[] )
         }
     KConfig src_cfg( file );
     KConfig dest_cfg( "kwinrulesrc" );
-    src_cfg.setGroup( "General" );
-    dest_cfg.setGroup( "General" );
-    int count = src_cfg.readEntry( "count", 0 );
-    int pos = dest_cfg.readEntry( "count", 0 );
+	KConfigGroup scg(&src_cfg, "General");
+	KConfigGroup dcg(&dest_cfg, "General");
+    int count = scg.readEntry( "count", 0 );
+    int pos = dcg.readEntry( "count", 0 );
     for( int group = 1;
          group <= count;
          ++group )
@@ -40,16 +40,15 @@ int main( int argc, char* argv[] )
         QMap< QString, QString > entries = src_cfg.entryMap( QString::number( group ));
         ++pos;
         dest_cfg.deleteGroup( QString::number( pos ));
-        dest_cfg.setGroup( QString::number( pos ));
+		KConfigGroup dcg2 (&dest_cfg, QString::number( pos ));
         for( QMap< QString, QString >::ConstIterator it = entries.begin();
              it != entries.end();
              ++it )
-            dest_cfg.writeEntry( it.key(), *it );
+            dcg2.writeEntry( it.key(), *it );
         }
-    dest_cfg.setGroup( "General" );
-    dest_cfg.writeEntry( "count", pos );
-    src_cfg.sync();
-    dest_cfg.sync();
+    dcg.writeEntry( "count", pos );
+    scg.sync();
+    dcg.sync();
     // Send signal to all kwin instances
     QDBusMessage message =
         QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
diff --git a/data/update_window_settings.cpp b/data/update_window_settings.cpp
index 7d78dd4c02..e1b6a84fab 100644
--- a/data/update_window_settings.cpp
+++ b/data/update_window_settings.cpp
@@ -101,8 +101,8 @@ void loadFakeSessionInfo( KConfig* config )
 
 void writeRules( KConfig& cfg )
     {
-    cfg.setGroup( "General" );
-    int pos = cfg.readEntry( "count",0 );
+	KConfigGroup cg(&cfg, "General");
+    int pos = cg.readEntry( "count",0 );
 
     QList<SessionInfo*>::iterator it;
     for ( it = fakeSession.begin(); it != fakeSession.end(); ++it)
@@ -110,7 +110,6 @@ void writeRules( KConfig& cfg )
         if( (*it)->resourceName.isEmpty() && (*it)->resourceClass.isEmpty())
             continue;
         ++pos;
-        cfg.setGroup( QString::number( pos ));
         KConfigGroup groupCfg(&cfg, QString::number( pos ));
         groupCfg.writeEntry( "description", ( const char* ) ( (*it)->resourceClass + " (KDE3.2)" ));
         groupCfg.writeEntry( "wmclass", ( const char* )( (*it)->resourceName + ' ' + (*it)->resourceClass ));
@@ -154,8 +153,7 @@ void writeRules( KConfig& cfg )
         groupCfg.writeEntry( "noborder", (*it)->userNoBorder );
         groupCfg.writeEntry( "noborderrule", 4 );
         }
-    cfg.setGroup( "General" );
-    cfg.writeEntry( "count", pos );
+    cg.writeEntry( "count", pos );
     }
 
 int main()