diff -Naur firewalld-0.2.2/config/firewalld.init firewalld-0.2.2-magellan/config/firewalld.init
--- firewalld-0.2.2/config/firewalld.init	2012-03-06 13:52:52.000000000 +0100
+++ firewalld-0.2.2-magellan/config/firewalld.init	2012-03-13 01:31:42.411982933 +0100
@@ -29,7 +29,7 @@
 prog="firewalld"
 #config="/etc/firewalld/firewalld.conf"
 
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog
 
 lockfile=/var/lock/subsys/$prog
 
diff -Naur firewalld-0.2.2/config/firewalld.service firewalld-0.2.2-magellan/config/firewalld.service
--- firewalld-0.2.2/config/firewalld.service	2012-03-06 13:52:52.000000000 +0100
+++ firewalld-0.2.2-magellan/config/firewalld.service	2012-03-13 01:32:09.069982933 +0100
@@ -5,7 +5,7 @@
 Conflicts=iptables.service ip6tables.service ebtables.service
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
+EnvironmentFile=-/etc/conf.d/firewalld
 ExecStart=/usr/sbin/firewalld --nofork
 ExecReload=/usr/bin/firewall-cmd --reload
 
diff -Naur firewalld-0.2.2/config/Makefile.am firewalld-0.2.2-magellan/config/Makefile.am
--- firewalld-0.2.2/config/Makefile.am	2012-03-06 13:52:52.000000000 +0100
+++ firewalld-0.2.2-magellan/config/Makefile.am	2012-03-13 01:33:00.024982932 +0100
@@ -54,11 +54,11 @@
 endif
 
 install-sysconfig:
-	mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 install-init: firewalld.init firewalld.sysconfig
 	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
@@ -66,7 +66,7 @@
 
 uninstall-init:
 	rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/firewalld
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 install-service:
 	mkdir -p $(DESTDIR)$(SYSTEMD_UNITDIR)
diff -Naur firewalld-0.2.2/config/Makefile.in firewalld-0.2.2-magellan/config/Makefile.in
--- firewalld-0.2.2/config/Makefile.in	2012-03-06 13:52:52.000000000 +0100
+++ firewalld-0.2.2-magellan/config/Makefile.in	2012-03-13 01:33:40.706982932 +0100
@@ -516,11 +516,11 @@
 all: $(dist_desktop_DATA) $(dist_polkit1_action_DATA)
 
 install-sysconfig:
-	mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 install-init: firewalld.init firewalld.sysconfig
 	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
@@ -528,7 +528,7 @@
 
 uninstall-init:
 	rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/firewalld
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 install-service:
 	mkdir -p $(DESTDIR)$(SYSTEMD_UNITDIR)
diff -Naur firewalld-0.2.2/firewalld.spec firewalld-0.2.2-magellan/firewalld.spec
--- firewalld-0.2.2/firewalld.spec	2012-03-06 13:52:52.000000000 +0100
+++ firewalld-0.2.2-magellan/firewalld.spec	2012-03-13 01:34:04.748982932 +0100
@@ -148,7 +148,7 @@
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
 %defattr(0644,root,root)
-%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
+%config(noreplace) %{_sysconfdir}/conf.d/firewalld
 #%attr(0755,root,root) %{_initrddir}/firewalld
 %{_unitdir}/firewalld.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf