diff -Naur firewalld-0.2.1/config/firewalld.init firewalld-0.2.1-magellan/config/firewalld.init
--- firewalld-0.2.1/config/firewalld.init	2012-02-21 13:34:22.000000000 +0100
+++ firewalld-0.2.1-magellan/config/firewalld.init	2012-03-02 21:40:52.710982387 +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.1/config/firewalld.service firewalld-0.2.1-magellan/config/firewalld.service
--- firewalld-0.2.1/config/firewalld.service	2012-02-21 13:34:22.000000000 +0100
+++ firewalld-0.2.1-magellan/config/firewalld.service	2012-03-02 21:41:10.409982387 +0100
@@ -6,7 +6,7 @@
 
 [Service]
 Type=forking
-EnvironmentFile=-/etc/sysconfig/firewalld
+EnvironmentFile=-/etc/conf.d/firewalld
 ExecStart=/usr/sbin/firewalld
 ExecReload=/usr/bin/firewall-cmd --reload
 
diff -Naur firewalld-0.2.1/config/Makefile.am firewalld-0.2.1-magellan/config/Makefile.am
--- firewalld-0.2.1/config/Makefile.am	2012-02-21 13:34:22.000000000 +0100
+++ firewalld-0.2.1-magellan/config/Makefile.am	2012-03-02 21:43:32.524982386 +0100
@@ -53,11 +53,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
@@ -65,7 +65,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.1/config/Makefile.in firewalld-0.2.1-magellan/config/Makefile.in
--- firewalld-0.2.1/config/Makefile.in	2012-02-21 13:34:22.000000000 +0100
+++ firewalld-0.2.1-magellan/config/Makefile.in	2012-03-02 21:42:44.736982387 +0100
@@ -512,11 +512,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
@@ -524,7 +524,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.1/firewalld.spec firewalld-0.2.1-magellan/firewalld.spec
--- firewalld-0.2.1/firewalld.spec	2012-02-21 13:34:22.000000000 +0100
+++ firewalld-0.2.1-magellan/firewalld.spec	2012-03-02 21:43:57.265982386 +0100
@@ -140,7 +140,7 @@
 %{_sysconfdir}/firewalld/zones/*.xml
 %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 %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