diff -Naur firewalld-0.5.2/config/firewalld.init firewalld-0.5.2-confd/config/firewalld.init
--- firewalld-0.5.2/config/firewalld.init	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/config/firewalld.init	2019-10-21 12:27:37.172641608 +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.5.2/config/firewalld.service.in firewalld-0.5.2-confd/config/firewalld.service.in
--- firewalld-0.5.2/config/firewalld.service.in	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/config/firewalld.service.in	2019-10-21 12:27:55.546379153 +0200
@@ -8,7 +8,7 @@
 Documentation=man:firewalld(1)
 
 [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.5.2/config/Makefile.am firewalld-0.5.2-confd/config/Makefile.am
--- firewalld-0.5.2/config/Makefile.am	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/config/Makefile.am	2019-10-21 12:32:31.663430037 +0200
@@ -308,12 +308,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.5.2/doc/xml/firewall-offline-cmd.xml firewalld-0.5.2-confd/doc/xml/firewall-offline-cmd.xml
--- firewalld-0.5.2/doc/xml/firewall-offline-cmd.xml	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/doc/xml/firewall-offline-cmd.xml	2019-10-21 12:28:31.836860611 +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>
diff -Naur firewalld-0.5.2/src/firewall/config/__init__.py.in firewalld-0.5.2-confd/src/firewall/config/__init__.py.in
--- firewalld-0.5.2/src/firewall/config/__init__.py.in	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/src/firewall/config/__init__.py.in	2019-10-21 12:29:49.577749272 +0200
@@ -96,7 +96,7 @@
 
 FIREWALLD_TEMPDIR = '/run/firewalld'
 
-SYSCONFIGDIR = '/etc/sysconfig'
+SYSCONFIGDIR = '/etc/conf.d'
 IFCFGDIR = "@IFCFGDIR@"
 
 SYSCTL_CONFIG = '/etc/sysctl.conf'
diff -Naur firewalld-0.5.2/src/tests/firewall-offline-cmd.at firewalld-0.5.2-confd/src/tests/firewall-offline-cmd.at
--- firewalld-0.5.2/src/tests/firewall-offline-cmd.at	2018-03-13 18:41:50.000000000 +0100
+++ firewalld-0.5.2-confd/src/tests/firewall-offline-cmd.at	2019-10-21 12:29:19.815174824 +0200
@@ -19,7 +19,7 @@
     FWD_CHECK([--addmodule=abc --addmodule=efg --removemodule=xyz dnl
         --trust=eth+ --trust=em0 dnl
         --masq=tun+ --masq=tap+ --port=7:tcp --port=666:udp dnl
-        --custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config dnl
+        --custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config dnl
         --service=dns --service=ftp --remove-service=dhcpv6-client dnl
         --block-icmp=router-advertisement --block-icmp=router-solicitation dnl
         --forward-port=if=ippp+:port=13:proto=tcp:toport=15:toaddr=1.2.3.4 dnl
@@ -45,7 +45,7 @@
         --masq=tap+
         --port=7:tcp
         --port=666:udp
-        --custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config
+        --custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config
         --service=dns
         --service=ftp
         --remove-service=dhcpv6-client