diff --git a/kcmodule/global/GeneralPage.cpp b/kcmodule/global/GeneralPage.cpp
index 065d0900..f9b5b6f7 100644
--- a/kcmodule/global/GeneralPage.cpp
+++ b/kcmodule/global/GeneralPage.cpp
@@ -1,197 +1,208 @@
 /***************************************************************************
  *   Copyright (C) 2008 by Dario Freddi <drf@kde.org>                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 #include "GeneralPage.h"
 
 #include "ErrorOverlay.h"
 #include "PowerDevilSettings.h"
 
 #include "actions/bundled/suspendsession.h"
 
 #include <Solid/Device>
 #include <Solid/DeviceInterface>
 #include <Solid/Battery>
 #include <Solid/PowerManagement>
 
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusReply>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusMetaType>
 #include <QtDBus/QDBusServiceWatcher>
 
 #include <KNotifyConfigWidget>
 #include <KPluginFactory>
 #include <KSharedConfig>
 #include <KAboutData>
 #include <KLocalizedString>
 
 K_PLUGIN_FACTORY(PowerDevilGeneralKCMFactory,
                  registerPlugin<GeneralPage>();
                 )
 
 GeneralPage::GeneralPage(QWidget *parent, const QVariantList &args)
         : KCModule(0, parent, args)
 {
     setButtons(Apply | Help);
 
 //     KAboutData *about =
 //         new KAboutData("powerdevilglobalconfig", "powerdevilglobalconfig", ki18n("Global Power Management Configuration"),
 //                        "", ki18n("A global power management configurator for KDE Power Management System"),
 //                        KAboutData::License_GPL, ki18n("(c), 2010 Dario Freddi"),
 //                        ki18n("From this module, you can configure the main Power Management daemon, assign profiles to "
 //                              "states, and do some advanced fine tuning on battery handling"));
 //
 //     about->addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer") , "drf@kde.org",
 //                      "http://drfav.wordpress.com");
 //
 //     setAboutData(about);
 
     setupUi(this);
 
     fillUi();
 
     QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.Solid.PowerManagement",
                                                            QDBusConnection::sessionBus(),
                                                            QDBusServiceWatcher::WatchForRegistration |
                                                            QDBusServiceWatcher::WatchForUnregistration,
                                                            this);
 
     connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(onServiceRegistered(QString)));
     connect(watcher, SIGNAL(serviceUnregistered(QString)), this, SLOT(onServiceUnregistered(QString)));
 
     if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Solid.PowerManagement")) {
         onServiceRegistered("org.kde.Solid.PowerManagement");
     } else {
         onServiceUnregistered("org.kde.Solid.PowerManagement");
     }
 }
 
 GeneralPage::~GeneralPage()
 {
 }
 
 void GeneralPage::fillUi()
 {
-    bool hasBattery = false;
+    bool hasPowerSupplyBattery = false;
+    bool hasPeripheralBattery = false;
 
-    Q_FOREACH(const Solid::Device &device, Solid::Device::listFromType(Solid::DeviceInterface::Battery, QString())) {
+    Q_FOREACH (const Solid::Device &device, Solid::Device::listFromType(Solid::DeviceInterface::Battery, QString())) {
         const Solid::Battery *b = qobject_cast<const Solid::Battery*> (device.asDeviceInterface(Solid::DeviceInterface::Battery));
-        if(b->type() == Solid::Battery::PrimaryBattery || b->type() == Solid::Battery::UpsBattery) {
-            hasBattery = true;
-            break;
+        if (b->isPowerSupply()) {
+            hasPowerSupplyBattery = true;
+        } else {
+            hasPeripheralBattery = true;
         }
     }
 
     QSet< Solid::PowerManagement::SleepState > methods = Solid::PowerManagement::supportedSleepStates();
 
     BatteryCriticalCombo->addItem(QIcon::fromTheme("dialog-cancel"), i18n("Do nothing"), PowerDevil::BundledActions::SuspendSession::None);
     if (methods.contains(Solid::PowerManagement::SuspendState)) {
         BatteryCriticalCombo->addItem(QIcon::fromTheme("system-suspend"), i18n("Suspend"), PowerDevil::BundledActions::SuspendSession::ToRamMode);
     }
     if (methods.contains(Solid::PowerManagement::HibernateState)) {
         BatteryCriticalCombo->addItem(QIcon::fromTheme("system-suspend-hibernate"), i18n("Hibernate"), PowerDevil::BundledActions::SuspendSession::ToDiskMode);
     }
     BatteryCriticalCombo->addItem(QIcon::fromTheme("system-shutdown"), i18n("Shut down"), PowerDevil::BundledActions::SuspendSession::ShutdownMode);
 
     notificationsButton->setIcon(QIcon::fromTheme("preferences-desktop-notification"));
 
     // modified fields...
 
     connect(notificationsButton, SIGNAL(clicked()), SLOT(configureNotifications()));
 
     connect(lowSpin, SIGNAL(valueChanged(int)), SLOT(changed()));
     connect(criticalSpin, SIGNAL(valueChanged(int)), SLOT(changed()));
+    connect(lowPeripheralSpin, SIGNAL(valueChanged(int)), SLOT(changed()));
 
     connect(BatteryCriticalCombo, SIGNAL(currentIndexChanged(int)), SLOT(changed()));
 
-    // Disable stuff, eventually
-    if (!hasBattery) {
-        batteryLevelsLabel->hide();
-
+    if (!hasPowerSupplyBattery) {
         BatteryCriticalLabel->hide();
         BatteryCriticalCombo->hide();
         lowLabel->hide();
         lowSpin->hide();
         criticalLabel->hide();
         criticalSpin->hide();
     }
+
+    if (!hasPeripheralBattery) {
+        lowPeripheralLabel->hide();
+        lowPeripheralSpin->hide();
+    }
+
+    if (!hasPeripheralBattery && !hasPeripheralBattery) {
+        batteryLevelsLabel->hide();
+    }
 }
 
 void GeneralPage::load()
 {
     lowSpin->setValue(PowerDevilSettings::batteryLowLevel());
     criticalSpin->setValue(PowerDevilSettings::batteryCriticalLevel());
+    lowPeripheralSpin->setValue(PowerDevilSettings::peripheralBatteryLowLevel());
 
     BatteryCriticalCombo->setCurrentIndex(BatteryCriticalCombo->findData(PowerDevilSettings::batteryCriticalAction()));
 }
 
 void GeneralPage::configureNotifications()
 {
     KNotifyConfigWidget::configure(this, "powerdevil");
 }
 
 void GeneralPage::save()
 {
     PowerDevilSettings::setBatteryLowLevel(lowSpin->value());
     PowerDevilSettings::setBatteryCriticalLevel(criticalSpin->value());
+    PowerDevilSettings::setPeripheralBatteryLowLevel(lowPeripheralSpin->value());
 
     PowerDevilSettings::setBatteryCriticalAction(BatteryCriticalCombo->itemData(BatteryCriticalCombo->currentIndex()).toInt());
 
     PowerDevilSettings::self()->save();
 
     // Notify Daemon
     QDBusMessage call = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement",
                                                        "org.kde.Solid.PowerManagement", "refreshStatus");
 
     // Perform call
     QDBusConnection::sessionBus().asyncCall(call);
 
     // And now we are set with no change
     Q_EMIT changed(false);
 }
 
 void GeneralPage::defaults()
 {
     KCModule::defaults();
 }
 
 void GeneralPage::onServiceRegistered(const QString& service)
 {
     Q_UNUSED(service);
 
     if (!m_errorOverlay.isNull()) {
         m_errorOverlay.data()->deleteLater();
     }
 }
 
 void GeneralPage::onServiceUnregistered(const QString& service)
 {
     Q_UNUSED(service);
 
     if (!m_errorOverlay.isNull()) {
         m_errorOverlay.data()->deleteLater();
     }
 
     m_errorOverlay = new ErrorOverlay(this, i18n("The Power Management Service appears not to be running.\n"
                                                  "This can be solved by starting or scheduling it inside \"Startup and Shutdown\""),
                                       this);
 }
 
 #include "GeneralPage.moc"
diff --git a/kcmodule/global/generalPage.ui b/kcmodule/global/generalPage.ui
index 75abca80..52985af9 100644
--- a/kcmodule/global/generalPage.ui
+++ b/kcmodule/global/generalPage.ui
@@ -1,177 +1,194 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>generalPage</class>
  <widget class="QWidget" name="generalPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>494</width>
     <height>276</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
      <property name="fieldGrowthPolicy">
       <enum>QFormLayout::ExpandingFieldsGrow</enum>
      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="batteryLevelsLabel">
        <property name="text">
         <string>&lt;b&gt;Battery Levels                     &lt;/b&gt;</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="lowLabel">
        <property name="text">
         <string>&amp;Low level:</string>
        </property>
        <property name="buddy">
         <cstring>lowSpin</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QSpinBox" name="lowSpin">
        <property name="maximumSize">
         <size>
          <width>100</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Low battery level</string>
        </property>
        <property name="whatsThis">
         <string>Battery will be considered low when it reaches this level</string>
        </property>
        <property name="suffix">
         <string>%</string>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="criticalLabel">
        <property name="text">
         <string>&amp;Critical level:</string>
        </property>
        <property name="buddy">
         <cstring>criticalSpin</cstring>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QSpinBox" name="criticalSpin">
        <property name="maximumSize">
         <size>
          <width>100</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Critical battery level</string>
        </property>
        <property name="whatsThis">
         <string>Battery will be considered critical when it reaches this level</string>
        </property>
        <property name="suffix">
         <string>%</string>
        </property>
        <property name="maximum">
         <number>100</number>
        </property>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="BatteryCriticalLabel">
        <property name="text">
         <string>A&amp;t critical level:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
        <property name="buddy">
         <cstring>BatteryCriticalCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="KComboBox" name="BatteryCriticalCombo">
        <property name="maximumSize">
         <size>
          <width>300</width>
          <height>16777215</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <spacer name="verticalSpacer_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>16</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="QPushButton" name="notificationsButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="text">
         <string>Configure Notifications...</string>
        </property>
       </widget>
      </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="lowPeripheralLabel">
+       <property name="text">
+        <string>Low level for peripheral devices:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QSpinBox" name="lowPeripheralSpin">
+       <property name="suffix">
+        <string>%</string>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>8</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>