diff -uNrp k3b-2.0.2~/CMakeLists.txt k3b-2.0.2/CMakeLists.txt
--- k3b-2.0.2~/CMakeLists.txt	2011-01-19 16:17:38.000000000 +0300
+++ k3b-2.0.2/CMakeLists.txt	2011-01-19 16:18:51.000000000 +0300
@@ -284,9 +284,6 @@ add_subdirectory( src )
 add_subdirectory( kioslaves )
 add_subdirectory( plugins )
 add_subdirectory( doc )
-if(BUILD_K3BSETUP)
-   add_subdirectory(k3bsetup)
-endif(BUILD_K3BSETUP)
 
 
 ##################  K3b config summary ################################
diff -uNrp k3b-2.0.2~/src/k3b.cpp k3b-2.0.2/src/k3b.cpp
--- k3b-2.0.2~/src/k3b.cpp	2011-01-19 16:17:38.000000000 +0300
+++ k3b-2.0.2/src/k3b.cpp	2011-01-19 16:18:06.000000000 +0300
@@ -1394,8 +1394,8 @@ void K3b::MainWindow::slotProjectAddFile
 void K3b::MainWindow::slotK3bSetup()
 {
     QStringList args;
-    args << "k3bsetup" << "--lang" << KGlobal::locale()->language();
-    if( !KProcess::startDetached( K3b::findExe("kcmshell4"), args ) )
+    args << "control";
+    if( !KProcess::startDetached( K3b::findExe("alterator-standalone"), args ) )
         KMessageBox::error( 0, i18n("Unable to start K3b::Setup.") );
 }
 
diff -uNrp k3b-2.0.2~/src/k3bsystemproblemdialog.cpp k3b-2.0.2/src/k3bsystemproblemdialog.cpp
--- k3b-2.0.2~/src/k3bsystemproblemdialog.cpp	2011-01-19 16:17:40.000000000 +0300
+++ k3b-2.0.2/src/k3bsystemproblemdialog.cpp	2011-01-19 16:18:06.000000000 +0300
@@ -611,8 +611,8 @@ void K3b::SystemProblemDialog::checkSyst
 void K3b::SystemProblemDialog::slotK3bSetup()
 {
     QStringList args;
-    args << "k3bsetup" << "--lang" << KGlobal::locale()->language();
-    if( !KProcess::startDetached( K3b::findExe("kcmshell4"), args ) )
+    args << "control";
+    if( !KProcess::startDetached( K3b::findExe("alterator-standalone"), args ) )
         KMessageBox::error( 0, i18n("Unable to start K3b::Setup.") );
 }
 
diff -uNrp k3b-2.0.2~/src/option/k3bdeviceoptiontab.cpp k3b-2.0.2/src/option/k3bdeviceoptiontab.cpp
--- k3b-2.0.2~/src/option/k3bdeviceoptiontab.cpp	2011-01-19 16:17:38.000000000 +0300
+++ k3b-2.0.2/src/option/k3bdeviceoptiontab.cpp	2011-01-19 16:18:06.000000000 +0300
@@ -80,8 +80,8 @@ void K3b::DeviceOptionTab::saveDevices()
 void K3b::DeviceOptionTab::slotModifyPermissionsButtonClicked()
 {
     QStringList args;
-    args << "k3bsetup" << "--lang" << KGlobal::locale()->language();
-    if( !KProcess::startDetached( K3b::findExe("kcmshell4"), args ) )
+    args << "control";
+    if( !KProcess::startDetached( K3b::findExe("alterator-standalone"), args ) )
         KMessageBox::error( this, i18n("Unable to start K3b::Setup.") );
 }