diff -Naur firewalld-0.3.12/config/firewalld.init firewalld-0.3.12-magellan/config/firewalld.init
--- firewalld-0.3.12/config/firewalld.init	2013-05-10 12:50:44.000000000 +0200
+++ firewalld-0.3.12-magellan/config/firewalld.init	2014-10-21 15:31:27.806408130 +0200
@@ -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.3.12/config/firewalld.service.in firewalld-0.3.12-magellan/config/firewalld.service.in
--- firewalld-0.3.12/config/firewalld.service.in	2014-07-23 19:00:38.000000000 +0200
+++ firewalld-0.3.12-magellan/config/firewalld.service.in	2014-10-21 15:32:20.214412080 +0200
@@ -6,7 +6,7 @@
 Conflicts=iptables.service ip6tables.service ebtables.service
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
+EnvironmentFile=-/etc/conf.d/firewalld
 ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 # supress to log debug and error output also to /var/log/messages
diff -Naur firewalld-0.3.12/config/Makefile.am firewalld-0.3.12-magellan/config/Makefile.am
--- firewalld-0.3.12/config/Makefile.am	2014-10-14 13:02:26.000000000 +0200
+++ firewalld-0.3.12-magellan/config/Makefile.am	2014-10-21 15:33:36.560417834 +0200
@@ -172,12 +172,12 @@
 	$(edit) $< >$@
 
 install-sysconfig:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
+	rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
 
 install-rpmmacros:
 	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
diff -Naur firewalld-0.3.12/config/Makefile.in firewalld-0.3.12-magellan/config/Makefile.in
--- firewalld-0.3.12/config/Makefile.in	2014-10-14 18:03:37.000000000 +0200
+++ firewalld-0.3.12-magellan/config/Makefile.in	2014-10-21 15:34:16.271420827 +0200
@@ -767,12 +767,12 @@
 	$(edit) $< >$@
 
 install-sysconfig:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
+	rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
 
 install-rpmmacros:
 	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
diff -Naur firewalld-0.3.12/doc/man/man1/firewall-cmd.1 firewalld-0.3.12-magellan/doc/man/man1/firewall-cmd.1
--- firewalld-0.3.12/doc/man/man1/firewall-cmd.1	2014-10-14 18:05:35.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/man/man1/firewall-cmd.1	2014-10-21 15:39:17.538443534 +0200
@@ -597,7 +597,7 @@
 As a end user you don\*(Aqt need this in most cases, because NetworkManager (or legacy network service) adds interfaces into zones automatically (according to
 \fBZONE=\fR
 option from ifcfg\-\fIinterface\fR
-file)\&. You should do it only if there\*(Aqs no /etc/sysconfig/network\-scripts/ifcfg\-\fIinterface\fR
+file)\&. You should do it only if there\*(Aqs no /etc/conf.d/network\-scripts/ifcfg\-\fIinterface\fR
 file\&. If there is such file and you add interface to zone with this
 \fB\-\-add\-interface\fR
 option, make sure the zone is the same in both cases, otherwise the behaviour would be undefined\&. For permanent association of interface with a zone, see also \*(AqHow to set or change a zone for a connection?\*(Aq in
diff -Naur firewalld-0.3.12/doc/man/man1/firewalld.1 firewalld-0.3.12-magellan/doc/man/man1/firewalld.1
--- firewalld-0.3.12/doc/man/man1/firewalld.1	2014-10-14 18:03:46.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/man/man1/firewalld.1	2014-10-21 16:07:46.235572318 +0200
@@ -78,7 +78,7 @@
 the section called \(lqDIRECTORIES\(rq)\&.
 .PP
 If NetworkManager is not used, there are some limitations: firewalld will not get notified about network device renames\&. If firewalld gets started after the network is already up, the connections and manually created interfaces are not bound to a zone\&. You can add them to a zone with
-\fBfirewall\-cmd [\-\-permanent] \-\-zone=\fR\fB\fIzone\fR\fR\fB \-\-add\-interface=\fR\fB\fIinterface\fR\fR, but make sure that if there\*(Aqs a /etc/sysconfig/network\-scripts/ifcfg\-\fIinterface\fR, the zone specified there with ZONE=\fIzone\fR
+\fBfirewall\-cmd [\-\-permanent] \-\-zone=\fR\fB\fIzone\fR\fR\fB \-\-add\-interface=\fR\fB\fIinterface\fR\fR, but make sure that if there\*(Aqs a /etc/conf.d/network\-scripts/ifcfg\-\fIinterface\fR, the zone specified there with ZONE=\fIzone\fR
 is the same (or both are empty/missing for default zone), otherwise the behaviour would be undefined\&.
 .SS "Zones"
 .PP
diff -Naur firewalld-0.3.12/doc/man/man1/firewall-offline-cmd.1 firewalld-0.3.12-magellan/doc/man/man1/firewall-offline-cmd.1
--- firewalld-0.3.12/doc/man/man1/firewall-offline-cmd.1	2014-10-14 18:03:46.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/man/man1/firewall-offline-cmd.1	2014-10-21 15:34:40.849422680 +0200
@@ -42,7 +42,7 @@
 .SH "OPTIONS"
 .PP
 If no options are given, configuration from
-\fB/etc/sysconfig/system\-config\-firewall\fR
+\fB/etc/conf.d/system\-config\-firewall\fR
 will be migrated\&.
 .PP
 The following options are supported:
diff -Naur firewalld-0.3.12/doc/xml/firewall-cmd.xml firewalld-0.3.12-magellan/doc/xml/firewall-cmd.xml
--- firewalld-0.3.12/doc/xml/firewall-cmd.xml	2014-10-14 13:02:26.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/xml/firewall-cmd.xml	2014-10-21 15:38:00.409437720 +0200
@@ -649,7 +649,7 @@
 	    </para>
 	    <para>
 	      As a end user you don't need this in most cases, because NetworkManager (or legacy network service) adds interfaces into zones automatically (according to <option>ZONE=</option> option from ifcfg-<replaceable>interface</replaceable> file).
-	      You should do it only if there's no /etc/sysconfig/network-scripts/ifcfg-<replaceable>interface</replaceable> file.
+	      You should do it only if there's no /etc/conf.d/network-scripts/ifcfg-<replaceable>interface</replaceable> file.
 	      If there is such file and you add interface to zone with this <option>--add-interface</option> option, make sure the zone is the same in both cases, otherwise the behaviour would be undefined.
 	      For permanent association of interface with a zone, see also 'How to set or change a zone for a connection?' in <citerefentry><refentrytitle>firewalld.zones</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
 	    </para>
diff -Naur firewalld-0.3.12/doc/xml/firewalld.xml firewalld-0.3.12-magellan/doc/xml/firewalld.xml
--- firewalld-0.3.12/doc/xml/firewalld.xml	2014-09-17 14:06:35.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/xml/firewalld.xml	2014-10-21 15:37:28.762435335 +0200
@@ -126,7 +126,7 @@
       If NetworkManager is not used, there are some limitations: firewalld will not get notified about network device renames.
       If firewalld gets started after the network is already up, the connections and manually created interfaces are not bound to a zone.
       You can add them to a zone with <command>firewall-cmd [--permanent] --zone=<replaceable>zone</replaceable> --add-interface=<replaceable>interface</replaceable></command>,
-      but make sure that if there's a /etc/sysconfig/network-scripts/ifcfg-<replaceable>interface</replaceable>,
+      but make sure that if there's a /etc/conf.d/network-scripts/ifcfg-<replaceable>interface</replaceable>,
       the zone specified there with ZONE=<replaceable>zone</replaceable>
       is the same (or both are empty/missing for default zone), otherwise the behaviour would be undefined.
     </para>
diff -Naur firewalld-0.3.12/doc/xml/firewall-offline-cmd.xml firewalld-0.3.12-magellan/doc/xml/firewall-offline-cmd.xml
--- firewalld-0.3.12/doc/xml/firewall-offline-cmd.xml	2014-09-17 14:06:35.000000000 +0200
+++ firewalld-0.3.12-magellan/doc/xml/firewall-offline-cmd.xml	2014-10-21 15:35:01.944424270 +0200
@@ -68,7 +68,7 @@
   <refsect1 id="options">
     <title>Options</title>
     <para>
-      If no options are given, configuration from <command>/etc/sysconfig/system-config-firewall</command> will be migrated.
+      If no options are given, configuration from <command>/etc/conf.d/system-config-firewall</command> will be migrated.
     </para>
     <para>
       The following options are supported:
diff -Naur firewalld-0.3.12/firewalld.spec firewalld-0.3.12-magellan/firewalld.spec
--- firewalld-0.3.12/firewalld.spec	2014-10-14 18:01:53.000000000 +0200
+++ firewalld-0.3.12-magellan/firewalld.spec	2014-10-21 15:35:25.513426046 +0200
@@ -131,7 +131,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
diff -Naur firewalld-0.3.12/src/firewall-offline-cmd firewalld-0.3.12-magellan/src/firewall-offline-cmd
--- firewalld-0.3.12/src/firewall-offline-cmd	2014-09-17 14:06:35.000000000 +0200
+++ firewalld-0.3.12-magellan/src/firewall-offline-cmd	2014-10-21 15:36:53.666432690 +0200
@@ -44,7 +44,7 @@
     print ("""
 Usage: firewall-offline-cmd [OPTIONS...]
 
-If no options are given, configuration from '/etc/sysconfig/system-config-firewall' will be migrated.
+If no options are given, configuration from '/etc/conf.d/system-config-firewall' will be migrated.
 
 General Options
   -h, --help           Prints a short help text and exists
@@ -70,7 +70,7 @@
   --custom-rules=[<type>:][<table>:]<filename>
                         Ignored option. Was used to add custom rules to the
                         firewall (Example:
-                        ipv4:filter:/etc/sysconfig/ipv4_filter_addon)
+                        ipv4:filter:/etc/conf.d/ipv4_filter_addon)
   --forward-port=if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:toaddr=<destination address>]
                         Forward the port with protocol for the interface to
                         either another local destination port (no destination
@@ -376,7 +376,7 @@
         __fail('no such file '+_PK_DIR+_PK_NAME+product+'.policy')
 
 # system-config-firewall: fw_sysconfig
-CONFIG = '/etc/sysconfig/system-config-firewall'
+CONFIG = '/etc/conf.d/system-config-firewall'
 def read_sysconfig_args():
     filename = None
     if os.path.exists(CONFIG) and os.path.isfile(CONFIG):
@@ -562,7 +562,7 @@
         args.append(joinArgs(aux_args[i+1:])) # add <args> as one arg
     a = parser.parse_args(args)
 else:
-    # migrate configuration from /etc/sysconfig/system-config-firewall
+    # migrate configuration from /etc/conf.d/system-config-firewall
     args = read_sysconfig_args()
     if args:
         a = parser.parse_args(args)