diff --git a/data/dbus-interfaces/net.hadess.PowerProfiles.xml b/data/dbus-interfaces/net.hadess.PowerProfiles.xml
deleted file mode 100644
index fce04a86d..000000000
--- a/data/dbus-interfaces/net.hadess.PowerProfiles.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/data/dbus-interfaces/org.freedesktop.UPower.PowerProfiles.xml b/data/dbus-interfaces/org.freedesktop.UPower.PowerProfiles.xml
new file mode 100644
index 000000000..ce8d75460
--- /dev/null
+++ b/data/dbus-interfaces/org.freedesktop.UPower.PowerProfiles.xml
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/gnome-shell-dbus-interfaces.gresource.xml b/data/gnome-shell-dbus-interfaces.gresource.xml
index 8eccc82bf..586d85be6 100644
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -1,7 +1,6 @@
- net.hadess.PowerProfiles.xml
net.hadess.SensorProxy.xml
net.reactivated.Fprint.Device.xml
net.reactivated.Fprint.Manager.xml
@@ -30,6 +29,7 @@
org.freedesktop.realmd.Service.xml
org.freedesktop.UPower.Device.xml
org.freedesktop.UPower.xml
+ org.freedesktop.UPower.PowerProfiles.xml
org.gnome.Mutter.ScreenCast.xml
org.gnome.ScreenSaver.xml
org.gnome.SessionManager.EndSessionDialog.xml
diff --git a/js/ui/status/powerProfiles.js b/js/ui/status/powerProfiles.js
index 6a9ea04e9..21680207d 100644
--- a/js/ui/status/powerProfiles.js
+++ b/js/ui/status/powerProfiles.js
@@ -8,10 +8,10 @@ import * as PopupMenu from '../popupMenu.js';
import {loadInterfaceXML} from '../../misc/fileUtils.js';
-const BUS_NAME = 'net.hadess.PowerProfiles';
-const OBJECT_PATH = '/net/hadess/PowerProfiles';
+const BUS_NAME = 'org.freedesktop.UPower.PowerProfiles';
+const OBJECT_PATH = '/org/freedesktop/UPower/PowerProfiles';
-const PowerProfilesIface = loadInterfaceXML('net.hadess.PowerProfiles');
+const PowerProfilesIface = loadInterfaceXML('org.freedesktop.UPower.PowerProfiles');
const PowerProfilesProxy = Gio.DBusProxy.makeProxyWrapper(PowerProfilesIface);
const PROFILE_PARAMS = {