diff --git a/ChangeLog b/ChangeLog
index edf3ddfc17..f242ba6916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-30  Dan Williams  <dcbw@redhat.com>
+
+	* system-settings/plugins/ifcfg
+	* system-settings/plugins/ifcfg-fedora
+		- Move the ifcfg plugin to ifcfg-fedora
+
 2008-01-24  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-device-802-11-wireless.c
diff --git a/configure.in b/configure.in
index f64d4b542f..f300d559c7 100644
--- a/configure.in
+++ b/configure.in
@@ -277,7 +277,7 @@ dispatcher-daemon/Makefile
 system-settings/Makefile
 system-settings/src/Makefile
 system-settings/plugins/Makefile
-system-settings/plugins/ifcfg/Makefile
+system-settings/plugins/ifcfg-fedora/Makefile
 test/Makefile
 test/test-common/Makefile
 initscript/Makefile
diff --git a/system-settings/plugins/Makefile.am b/system-settings/plugins/Makefile.am
index a0eb4d9e4e..4f09e2c355 100644
--- a/system-settings/plugins/Makefile.am
+++ b/system-settings/plugins/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS=ifcfg
+SUBDIRS=ifcfg-fedora
 
diff --git a/system-settings/plugins/ifcfg/Makefile.am b/system-settings/plugins/ifcfg-fedora/Makefile.am
similarity index 56%
rename from system-settings/plugins/ifcfg/Makefile.am
rename to system-settings/plugins/ifcfg-fedora/Makefile.am
index 0ae42befab..ab00fbb0c0 100644
--- a/system-settings/plugins/ifcfg/Makefile.am
+++ b/system-settings/plugins/ifcfg-fedora/Makefile.am
@@ -1,7 +1,7 @@
 
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-fedora.la
 
-libnm_settings_plugin_ifcfg_la_SOURCES = \
+libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \
 	shvar.c \
 	shvar.h \
 	parser.c \
@@ -9,7 +9,7 @@ libnm_settings_plugin_ifcfg_la_SOURCES = \
 	plugin.c \
 	plugin.h
 
-libnm_settings_plugin_ifcfg_la_CPPFLAGS = \
+libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
@@ -19,8 +19,8 @@ libnm_settings_plugin_ifcfg_la_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-util \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
-libnm_settings_plugin_ifcfg_la_LDFLAGS = -module -avoid-version
-libnm_settings_plugin_ifcfg_la_LIBADD = \
+libnm_settings_plugin_ifcfg_fedora_la_LDFLAGS = -module -avoid-version
+libnm_settings_plugin_ifcfg_fedora_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la
diff --git a/system-settings/plugins/ifcfg/parser.c b/system-settings/plugins/ifcfg-fedora/parser.c
similarity index 100%
rename from system-settings/plugins/ifcfg/parser.c
rename to system-settings/plugins/ifcfg-fedora/parser.c
diff --git a/system-settings/plugins/ifcfg/parser.h b/system-settings/plugins/ifcfg-fedora/parser.h
similarity index 100%
rename from system-settings/plugins/ifcfg/parser.h
rename to system-settings/plugins/ifcfg-fedora/parser.h
diff --git a/system-settings/plugins/ifcfg/plugin.c b/system-settings/plugins/ifcfg-fedora/plugin.c
similarity index 100%
rename from system-settings/plugins/ifcfg/plugin.c
rename to system-settings/plugins/ifcfg-fedora/plugin.c
diff --git a/system-settings/plugins/ifcfg/plugin.h b/system-settings/plugins/ifcfg-fedora/plugin.h
similarity index 100%
rename from system-settings/plugins/ifcfg/plugin.h
rename to system-settings/plugins/ifcfg-fedora/plugin.h
diff --git a/system-settings/plugins/ifcfg/shvar.c b/system-settings/plugins/ifcfg-fedora/shvar.c
similarity index 100%
rename from system-settings/plugins/ifcfg/shvar.c
rename to system-settings/plugins/ifcfg-fedora/shvar.c
diff --git a/system-settings/plugins/ifcfg/shvar.h b/system-settings/plugins/ifcfg-fedora/shvar.h
similarity index 100%
rename from system-settings/plugins/ifcfg/shvar.h
rename to system-settings/plugins/ifcfg-fedora/shvar.h