diff -u'Nrpk~' kdemultimedia-3.5.6~/kmix/kmix.cpp kdemultimedia-3.5.6/kmix/kmix.cpp
--- kdemultimedia-3.5.6~/kmix/kmix.cpp	2007-01-15 14:22:56 +0300
+++ kdemultimedia-3.5.6/kmix/kmix.cpp	2007-01-26 21:26:04 +0300
@@ -269,6 +269,7 @@ KMixWindow::saveConfig()
       config->writeEntry( "Orientation","Vertical" );
    else
       config->writeEntry( "Orientation","Horizontal" );
+   config->writeEntry( "Autostart", m_autoStart );
 
    // save mixer widgets
    for ( KMixerWidget *mw = m_mixerWidgets.first(); mw != 0; mw = m_mixerWidgets.next() )
@@ -319,6 +320,7 @@ KMixWindow::loadConfig()
        m_toplevelOrientation  = Qt::Vertical;
    else
        m_toplevelOrientation = Qt::Horizontal;
+   m_autoStart = config->readBoolEntry("Autostart", true);
 
    // show/hide menu bar
    m_showMenubar = config->readBoolEntry("Menubar", true);
@@ -433,6 +435,7 @@ KMixWindow::showSettings()
       m_prefDlg->_rbNone->setChecked( m_valueStyle == MixDeviceWidget::NNONE );
       m_prefDlg->_rbAbsolute->setChecked( m_valueStyle == MixDeviceWidget::NABSOLUTE );
       m_prefDlg->_rbRelative->setChecked( m_valueStyle == MixDeviceWidget::NRELATIVE );
+      m_prefDlg->m_autoStartChk->setChecked( m_autoStart );
 
       m_prefDlg->show();
    }
@@ -522,6 +525,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *pre
      //kdDebug(67100) << "KMix should change to Horizontal layout\n";
      m_toplevelOrientation = Qt::Horizontal;
    }
+   m_autoStart = prefDlg->m_autoStartChk->isChecked();
 
 
    this->setUpdatesEnabled(false);
diff -u'Nrpk~' kdemultimedia-3.5.6~/kmix/kmix.desktop kdemultimedia-3.5.6/kmix/kmix.desktop
--- kdemultimedia-3.5.6~/kmix/kmix.desktop	2007-01-15 14:22:56 +0300
+++ kdemultimedia-3.5.6/kmix/kmix.desktop	2007-01-26 21:26:04 +0300
@@ -83,4 +83,7 @@ Name[ven]=U tanganisa ha K
 Name[zh_TW]=KMix 混音器
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
+X-KDE-autostart-phase=2
+X-KDE-autostart-after=panel
+X-KDE-autostart-condition=kmixrc::Autostart:true
 Categories=Qt;KDE;AudioVideo;Audio;Mixer;
diff -u'Nrpk~' kdemultimedia-3.5.6~/kmix/kmix.h kdemultimedia-3.5.6/kmix/kmix.h
--- kdemultimedia-3.5.6~/kmix/kmix.h	2006-01-19 19:40:29 +0300
+++ kdemultimedia-3.5.6/kmix/kmix.h	2007-01-26 21:26:04 +0300
@@ -96,6 +96,7 @@ KMixWindow : public KMainWindow
    QPopupMenu *m_viewMenu;
    QPopupMenu *m_helpMenu;
 
+   bool m_autoStart;
    bool m_showDockWidget;
    bool m_volumeWidget;
    bool m_hideOnClose;
diff -u'Nrpk~' kdemultimedia-3.5.6~/kmix/kmixprefdlg.cpp kdemultimedia-3.5.6/kmix/kmixprefdlg.cpp
--- kdemultimedia-3.5.6~/kmix/kmixprefdlg.cpp	2006-07-22 12:10:54 +0400
+++ kdemultimedia-3.5.6/kmix/kmixprefdlg.cpp	2007-01-26 21:26:04 +0300
@@ -86,6 +86,10 @@ KMixPrefDlg::KMixPrefDlg( QWidget *paren
    numbersLayout->add(_rbRelative);
    numbersLayout->addStretch();
 
+   m_autoStartChk = new QCheckBox( i18n("&Autostart"), m_generalTab );
+   layout->addWidget( m_autoStartChk );
+   QWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
+
    QBoxLayout *orientationLayout = new QHBoxLayout( layout );
    QButtonGroup* orientationGroup = new QButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
    //orientationLayout->add(orientationGroup);
diff -u'Nrpk~' kdemultimedia-3.5.6~/kmix/kmixprefdlg.h kdemultimedia-3.5.6/kmix/kmixprefdlg.h
--- kdemultimedia-3.5.6~/kmix/kmixprefdlg.h	2006-01-19 19:40:29 +0300
+++ kdemultimedia-3.5.6/kmix/kmixprefdlg.h	2007-01-26 21:26:04 +0300
@@ -51,6 +51,7 @@ KMixPrefDlg : public KDialogBase  
    KMixApp *m_mixApp;
    KMixPrefWidget *m_mixPrefTab;
 
+   QCheckBox *m_autoStartChk;
    QCheckBox *m_dockingChk;
    QCheckBox *m_volumeChk;
    QCheckBox *m_hideOnCloseChk;