diff --git a/ChangeLog b/ChangeLog
index 46211c7b94..2904e1d33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-25  Dan Williams  <dcbw@redhat.com>
+
+	* system-settings/plugins/ifcfg-rh
+		- Rename 'ifcfg-fedora' to 'ifcfg-rh'; it's not just used on Fedora
+
+	* system-settings/src/main.c
+		- (load_plugins): transparently handle ifcfg-fedora as ifcfg-rh
+
 2008-11-25  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Tambet Ingo <tambet@gmail.com>
diff --git a/configure.in b/configure.in
index b11cc10977..8f6f425ee8 100644
--- a/configure.in
+++ b/configure.in
@@ -501,7 +501,7 @@ system-settings/Makefile
 system-settings/src/Makefile
 system-settings/plugins/Makefile
 system-settings/plugins/ifupdown/Makefile
-system-settings/plugins/ifcfg-fedora/Makefile
+system-settings/plugins/ifcfg-rh/Makefile
 system-settings/plugins/ifcfg-suse/Makefile
 system-settings/plugins/keyfile/Makefile
 test/Makefile
diff --git a/system-settings/plugins/Makefile.am b/system-settings/plugins/Makefile.am
index 84a982570f..94f75600d1 100644
--- a/system-settings/plugins/Makefile.am
+++ b/system-settings/plugins/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=keyfile
 
 if TARGET_REDHAT
-SUBDIRS+=ifcfg-fedora
+SUBDIRS+=ifcfg-rh
 endif
 
 if TARGET_SUSE
@@ -9,7 +9,7 @@ SUBDIRS+=ifcfg-suse
 endif
 
 if TARGET_MANDRIVA
-SUBDIRS+=ifcfg-fedora
+SUBDIRS+=ifcfg-rh
 endif
 
 if TARGET_DEBIAN
diff --git a/system-settings/plugins/ifcfg-fedora/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am
similarity index 63%
rename from system-settings/plugins/ifcfg-fedora/Makefile.am
rename to system-settings/plugins/ifcfg-rh/Makefile.am
index 09aeaa72d1..856a15dc43 100644
--- a/system-settings/plugins/ifcfg-fedora/Makefile.am
+++ b/system-settings/plugins/ifcfg-rh/Makefile.am
@@ -1,7 +1,7 @@
 
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-fedora.la
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-rh.la
 
-libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \
+libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 	shvar.c \
 	shvar.h \
 	plugin.c \
@@ -12,7 +12,7 @@ libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \
 	reader.h \
 	common.h
 
-libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \
+libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
@@ -24,8 +24,8 @@ libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \
 	-I$(top_builddir)/marshallers \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
-libnm_settings_plugin_ifcfg_fedora_la_LDFLAGS = -module -avoid-version
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD = \
+libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
+libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la \
@@ -33,10 +33,10 @@ libnm_settings_plugin_ifcfg_fedora_la_LIBADD = \
 	$(top_builddir)/marshallers/libmarshallers.la
 
 if NO_GIO
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD += \
+libnm_settings_plugin_ifcfg_rh_la_LIBADD += \
 	$(top_builddir)/gfilemonitor/libgfilemonitor.la
 else
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD += \
+libnm_settings_plugin_ifcfg_rh_la_LIBADD += \
 	$(GIO_LIBS)
 endif
 
diff --git a/system-settings/plugins/ifcfg-fedora/common.h b/system-settings/plugins/ifcfg-rh/common.h
similarity index 96%
rename from system-settings/plugins/ifcfg-fedora/common.h
rename to system-settings/plugins/ifcfg-rh/common.h
index 2980ed3ee5..812bebcb22 100644
--- a/system-settings/plugins/ifcfg-fedora/common.h
+++ b/system-settings/plugins/ifcfg-rh/common.h
@@ -28,7 +28,7 @@
 #define ORIG_TAG ".orig"
 #define REJ_TAG ".rej"
 
-#define IFCFG_PLUGIN_NAME "ifcfg-fedora"
+#define IFCFG_PLUGIN_NAME "ifcfg-rh"
 #define IFCFG_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
 
 #include <glib.h>
diff --git a/system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
rename to system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
diff --git a/system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.h b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.h
rename to system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
diff --git a/system-settings/plugins/ifcfg-fedora/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/plugin.c
rename to system-settings/plugins/ifcfg-rh/plugin.c
diff --git a/system-settings/plugins/ifcfg-fedora/plugin.h b/system-settings/plugins/ifcfg-rh/plugin.h
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/plugin.h
rename to system-settings/plugins/ifcfg-rh/plugin.h
diff --git a/system-settings/plugins/ifcfg-fedora/reader.c b/system-settings/plugins/ifcfg-rh/reader.c
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/reader.c
rename to system-settings/plugins/ifcfg-rh/reader.c
diff --git a/system-settings/plugins/ifcfg-fedora/reader.h b/system-settings/plugins/ifcfg-rh/reader.h
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/reader.h
rename to system-settings/plugins/ifcfg-rh/reader.h
diff --git a/system-settings/plugins/ifcfg-fedora/shvar.c b/system-settings/plugins/ifcfg-rh/shvar.c
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/shvar.c
rename to system-settings/plugins/ifcfg-rh/shvar.c
diff --git a/system-settings/plugins/ifcfg-fedora/shvar.h b/system-settings/plugins/ifcfg-rh/shvar.h
similarity index 100%
rename from system-settings/plugins/ifcfg-fedora/shvar.h
rename to system-settings/plugins/ifcfg-rh/shvar.h
diff --git a/system-settings/src/main.c b/system-settings/src/main.c
index 9286486c5f..9162ad221e 100644
--- a/system-settings/src/main.c
+++ b/system-settings/src/main.c
@@ -111,31 +111,35 @@ load_plugins (Application *app, const char *plugins, GError **error)
 {
 	GSList *list = NULL;
 	char **plist;
-	char **pname;
+	char **iter;
 
 	plist = g_strsplit (plugins, ",", 0);
 	if (!plist)
 		return FALSE;
 
-	for (pname = plist; *pname; pname++) {
+	for (iter = plist; *iter; iter++) {
 		GModule *plugin;
-		char *full_name;
-		char *path;
+		char *full_name, *path;
+		const char *pname = *iter;
 		GObject *obj;
 		GObject * (*factory_func) (void);
 
-		obj = find_plugin (list, *pname);
+		/* ifcfg-fedora was renamed ifcfg-rh; handle old configs here */
+		if (!strcmp (pname, "ifcfg-fedora"))
+			pname = "ifcfg-rh";
+
+		obj = find_plugin (list, pname);
 		if (obj)
 			continue;
 
-		full_name = g_strdup_printf ("nm-settings-plugin-%s", *pname);
+		full_name = g_strdup_printf ("nm-settings-plugin-%s", pname);
 		path = g_module_build_path (PLUGINDIR, full_name);
 
 		plugin = g_module_open (path, G_MODULE_BIND_LOCAL);
 		if (!plugin) {
 			g_set_error (error, plugins_error_quark (), 0,
 			             "Could not load plugin '%s': %s",
-			             *pname, g_module_error ());
+			             pname, g_module_error ());
 			g_free (full_name);
 			g_free (path);
 			break;
@@ -147,7 +151,7 @@ load_plugins (Application *app, const char *plugins, GError **error)
 		if (!g_module_symbol (plugin, "nm_system_config_factory", (gpointer) (&factory_func))) {
 			g_set_error (error, plugins_error_quark (), 0,
 			             "Could not find plugin '%s' factory function.",
-			             *pname);
+			             pname);
 			break;
 		}
 
@@ -155,7 +159,7 @@ load_plugins (Application *app, const char *plugins, GError **error)
 		if (!obj || !NM_IS_SYSTEM_CONFIG_INTERFACE (obj)) {
 			g_set_error (error, plugins_error_quark (), 0,
 			             "Plugin '%s' returned invalid system config object.",
-			             *pname);
+			             pname);
 			break;
 		}