diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 9f341336..9f94b2fd 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -128,8 +128,8 @@ removefrom GConf2 /usr/libexec/gconf-defaults-mechanism /usr/share/GConf/*
 removefrom GConf2 /usr/share/locale/* /usr/share/sgml/*
 removefrom NetworkManager /usr/share/NetworkManager/*
 removefrom NetworkManager /usr/share/locale/*/NetworkManager.mo
-removefrom NetworkManager-gnome /etc/xdg/* /usr/bin/nm-applet /usr/${libdir}/*
-removefrom NetworkManager-gnome /usr/share/applications/*
+removefrom nm-connection-editor /usr/${libdir}/*
+removefrom nm-connection-editor /usr/share/applications/*
 removefrom anaconda /etc/* /usr/share/applications/* /usr/share/icons/*
 removefrom at-spi /etc/xdg/* /usr/${libdir}/libcspi*
 removefrom at-spi /usr/${libdir}/libloginhelper* /usr/share/locale/*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index acd65b1e..868ac37f 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -64,7 +64,7 @@ installpkg rsyslog
 installpkg xorg-x11-drivers xorg-x11-server-Xorg
 installpkg xorg-x11-server-utils xorg-x11-xauth
 installpkg dbus-x11 metacity gsettings-desktop-schemas
-installpkg NetworkManager-gnome
+installpkg nm-connection-editor
 installpkg at-spi at-spi2-atk pyatspi
 installpkg gnome-python2-gconf
 installpkg gobject-introspection