diff -Naur firewalld-0.3.8/config/firewalld.init firewalld-0.3.8-magellan/config/firewalld.init
--- firewalld-0.3.8/config/firewalld.init	2013-05-10 10:50:44.000000000 +0000
+++ firewalld-0.3.8-magellan/config/firewalld.init	2013-12-12 10:59:38.621000000 +0000
@@ -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.8/config/firewalld.service.in firewalld-0.3.8-magellan/config/firewalld.service.in
--- firewalld-0.3.8/config/firewalld.service.in	2013-05-10 10:50:44.000000000 +0000
+++ firewalld-0.3.8-magellan/config/firewalld.service.in	2013-12-12 11:01:18.078000000 +0000
@@ -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.8/config/Makefile.am firewalld-0.3.8-magellan/config/Makefile.am
--- firewalld-0.3.8/config/Makefile.am	2013-10-02 10:14:36.000000000 +0000
+++ firewalld-0.3.8-magellan/config/Makefile.am	2013-12-12 11:04:51.582000000 +0000
@@ -143,12 +143,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-init: install-sysconfig
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
diff -Naur firewalld-0.3.8/config/Makefile.in firewalld-0.3.8-magellan/config/Makefile.in
--- firewalld-0.3.8/config/Makefile.in	2013-11-05 14:50:33.000000000 +0000
+++ firewalld-0.3.8-magellan/config/Makefile.in	2013-12-12 11:06:32.960000000 +0000
@@ -714,12 +714,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-init: install-sysconfig
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
diff -Naur firewalld-0.3.8/firewalld.spec firewalld-0.3.8-magellan/firewalld.spec
--- firewalld-0.3.8/firewalld.spec	2013-11-05 14:50:07.000000000 +0000
+++ firewalld-0.3.8-magellan/firewalld.spec	2013-12-12 11:10:11.256000000 +0000
@@ -145,7 +145,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.8/po/ar.po firewalld-0.3.8-magellan/po/ar.po
--- firewalld-0.3.8/po/ar.po	2013-11-05 15:00:55.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ar.po	2013-12-12 11:02:29.042000000 +0000
@@ -1518,7 +1518,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/as.po firewalld-0.3.8-magellan/po/as.po
--- firewalld-0.3.8/po/as.po	2013-11-05 15:00:55.000000000 +0000
+++ firewalld-0.3.8-magellan/po/as.po	2013-12-12 11:02:29.064000000 +0000
@@ -1585,10 +1585,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "উপেক্ষিত বিকল্প। ফায়াৰৱালত স্বনিৰ্বাচিত নিয়মসমূহ যোগ কৰাৰ বাবে ব্যৱহাৰ কৰা হৈছিল "
-"(উদাহৰণস্বৰূপ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(উদাহৰণস্বৰূপ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/bn_IN.po firewalld-0.3.8-magellan/po/bn_IN.po
--- firewalld-0.3.8/po/bn_IN.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/bn_IN.po	2013-12-12 11:02:29.085000000 +0000
@@ -1516,7 +1516,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/ca.po firewalld-0.3.8-magellan/po/ca.po
--- firewalld-0.3.8/po/ca.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ca.po	2013-12-12 11:02:29.106000000 +0000
@@ -1520,7 +1520,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/cs.po firewalld-0.3.8-magellan/po/cs.po
--- firewalld-0.3.8/po/cs.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/cs.po	2013-12-12 11:02:29.127000000 +0000
@@ -1542,7 +1542,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/da.po firewalld-0.3.8-magellan/po/da.po
--- firewalld-0.3.8/po/da.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/da.po	2013-12-12 11:02:29.147000000 +0000
@@ -1521,7 +1521,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/de.po firewalld-0.3.8-magellan/po/de.po
--- firewalld-0.3.8/po/de.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/de.po	2013-12-12 11:02:29.169000000 +0000
@@ -1618,10 +1618,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Unberücksichtigte Option. Dies wurde benutzt, um benutzerdefinierte Regeln "
-"zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/sysconfig/"
+"zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/en_GB.po firewalld-0.3.8-magellan/po/en_GB.po
--- firewalld-0.3.8/po/en_GB.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/en_GB.po	2013-12-12 11:02:29.189000000 +0000
@@ -1541,10 +1541,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/es.po firewalld-0.3.8-magellan/po/es.po
--- firewalld-0.3.8/po/es.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/es.po	2013-12-12 11:02:29.212000000 +0000
@@ -1615,10 +1615,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Opción ignorada. Se usó para agregar reglas personalizadas al cortafuego "
-"(Ejemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(Ejemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/fi.po firewalld-0.3.8-magellan/po/fi.po
--- firewalld-0.3.8/po/fi.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/fi.po	2013-12-12 11:02:29.233000000 +0000
@@ -1519,7 +1519,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/fr.po firewalld-0.3.8-magellan/po/fr.po
--- firewalld-0.3.8/po/fr.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/fr.po	2013-12-12 11:02:29.255000000 +0000
@@ -1553,7 +1553,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/gu.po firewalld-0.3.8-magellan/po/gu.po
--- firewalld-0.3.8/po/gu.po	2013-11-05 15:00:56.000000000 +0000
+++ firewalld-0.3.8-magellan/po/gu.po	2013-12-12 11:09:34.630000000 +0000
@@ -1572,10 +1572,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "અવગણેલ વિકલ્પ. ફાયરવોલમાં વૈવિધ્ય નિયમોનું વાપરેલ હતુ (ઉદાહરણ: ipv4:filter:/etc/"
-"sysconfig/ipv4_filter_addon)"
+"conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/hi.po firewalld-0.3.8-magellan/po/hi.po
--- firewalld-0.3.8/po/hi.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/hi.po	2013-12-12 11:02:29.299000000 +0000
@@ -1514,7 +1514,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/hu.po firewalld-0.3.8-magellan/po/hu.po
--- firewalld-0.3.8/po/hu.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/hu.po	2013-12-12 11:02:29.322000000 +0000
@@ -1585,7 +1585,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/it.po firewalld-0.3.8-magellan/po/it.po
--- firewalld-0.3.8/po/it.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/it.po	2013-12-12 11:02:29.344000000 +0000
@@ -1624,10 +1624,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Opzione ignorata. E' utilizzata per aggiungere regole personalizzate per il "
-"firewall (Esempio : ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"firewall (Esempio : ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/ja.po firewalld-0.3.8-magellan/po/ja.po
--- firewalld-0.3.8/po/ja.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ja.po	2013-12-12 11:02:29.366000000 +0000
@@ -1603,10 +1603,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "無視されたオプション、カスタムルールをファイアウォールに追加するために使用さ"
-"れました (例: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)。"
+"れました (例: ipv4:filter:/etc/conf.d/ipv4_filter_addon)。"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/kn.po firewalld-0.3.8-magellan/po/kn.po
--- firewalld-0.3.8/po/kn.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/kn.po	2013-12-12 11:02:29.388000000 +0000
@@ -1518,7 +1518,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/ko.po firewalld-0.3.8-magellan/po/ko.po
--- firewalld-0.3.8/po/ko.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ko.po	2013-12-12 11:02:29.409000000 +0000
@@ -1521,7 +1521,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/ml.po firewalld-0.3.8-magellan/po/ml.po
--- firewalld-0.3.8/po/ml.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ml.po	2013-12-12 11:02:29.429000000 +0000
@@ -1515,7 +1515,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/mr.po firewalld-0.3.8-magellan/po/mr.po
--- firewalld-0.3.8/po/mr.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/mr.po	2013-12-12 11:02:29.450000000 +0000
@@ -1519,7 +1519,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/nl.po firewalld-0.3.8-magellan/po/nl.po
--- firewalld-0.3.8/po/nl.po	2013-11-05 15:00:57.000000000 +0000
+++ firewalld-0.3.8-magellan/po/nl.po	2013-12-12 11:02:29.472000000 +0000
@@ -1611,10 +1611,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Genegeerde optie. Werd gebruikt om aangepaste regels toe te voegen aan de "
-"firewall (Voorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"firewall (Voorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/or.po firewalld-0.3.8-magellan/po/or.po
--- firewalld-0.3.8/po/or.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/or.po	2013-12-12 11:02:29.493000000 +0000
@@ -1517,7 +1517,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/pa.po firewalld-0.3.8-magellan/po/pa.po
--- firewalld-0.3.8/po/pa.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/pa.po	2013-12-12 11:09:34.648000000 +0000
@@ -1575,10 +1575,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ਅਣਗੌਲੀ ਚੋਣ। ਫਾਇਰਵਾਲ ਲਈ ਚੁਣਿੰਦਾ ਨਿਯਮ ਜੋੜਨ ਲਈ ਵਰਤੀ ਗਈ ਸੀ (ਉਦਾਹਰਣ: ipv4:filter:/etc/"
-"sysconfig/ipv4_filter_addon)"
+"conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/pl.po firewalld-0.3.8-magellan/po/pl.po
--- firewalld-0.3.8/po/pl.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/pl.po	2013-12-12 11:02:29.538000000 +0000
@@ -1576,10 +1576,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Ignorowana opcja. Była używana do dodawania własnych reguł do zapory "
-"sieciowej (przykład: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"sieciowej (przykład: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/pt_BR.po firewalld-0.3.8-magellan/po/pt_BR.po
--- firewalld-0.3.8/po/pt_BR.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/pt_BR.po	2013-12-12 11:02:29.560000000 +0000
@@ -1598,10 +1598,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Ignorando a opção. Foi usado para adicionar regras personalizadas para o "
-"firewall (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"firewall (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/pt.po firewalld-0.3.8-magellan/po/pt.po
--- firewalld-0.3.8/po/pt.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/pt.po	2013-12-12 11:02:29.581000000 +0000
@@ -1521,7 +1521,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/ru.po firewalld-0.3.8-magellan/po/ru.po
--- firewalld-0.3.8/po/ru.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ru.po	2013-12-12 11:02:29.601000000 +0000
@@ -1542,7 +1542,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/sk.po firewalld-0.3.8-magellan/po/sk.po
--- firewalld-0.3.8/po/sk.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/sk.po	2013-12-12 11:02:29.622000000 +0000
@@ -1535,7 +1535,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/sr@latin.po firewalld-0.3.8-magellan/po/sr@latin.po
--- firewalld-0.3.8/po/sr@latin.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/sr@latin.po	2013-12-12 11:02:29.643000000 +0000
@@ -1519,7 +1519,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/sr.po firewalld-0.3.8-magellan/po/sr.po
--- firewalld-0.3.8/po/sr.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/sr.po	2013-12-12 11:02:29.664000000 +0000
@@ -1518,7 +1518,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/sv.po firewalld-0.3.8-magellan/po/sv.po
--- firewalld-0.3.8/po/sv.po	2013-11-05 15:00:58.000000000 +0000
+++ firewalld-0.3.8-magellan/po/sv.po	2013-12-12 11:02:29.685000000 +0000
@@ -1536,7 +1536,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/ta.po firewalld-0.3.8-magellan/po/ta.po
--- firewalld-0.3.8/po/ta.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/ta.po	2013-12-12 11:02:29.707000000 +0000
@@ -1601,10 +1601,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "விருப்பம் புறக்கணிக்கப்பட்டது. ஃபயர்வாலுக்கு தனிப்பயன் விதியைச் சேர்க்கப் பயன்படுத்தப்பட்டது "
-"(எடுத்துக்காட்டு: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(எடுத்துக்காட்டு: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/te.po firewalld-0.3.8-magellan/po/te.po
--- firewalld-0.3.8/po/te.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/te.po	2013-12-12 11:02:29.731000000 +0000
@@ -1556,10 +1556,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "విస్మరించిన ఐచ్చికం. ఫైర్‌వాల్‌కు వినియోగదారి మలచిన నియమాలు జతచేయుటకు వుపయోగించబడెను (ఉదాహరణ: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/tr.po firewalld-0.3.8-magellan/po/tr.po
--- firewalld-0.3.8/po/tr.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/tr.po	2013-12-12 11:02:29.752000000 +0000
@@ -1541,7 +1541,7 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/uk.po firewalld-0.3.8-magellan/po/uk.po
--- firewalld-0.3.8/po/uk.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/uk.po	2013-12-12 11:02:29.774000000 +0000
@@ -1609,10 +1609,10 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Ігнорований параметр. Використовувався для додавання нетипових правил "
-"обробки брандмауером (Приклад: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"обробки брандмауером (Приклад: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
 msgid ""
diff -Naur firewalld-0.3.8/po/zh_CN.po firewalld-0.3.8-magellan/po/zh_CN.po
--- firewalld-0.3.8/po/zh_CN.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/zh_CN.po	2013-12-12 11:02:29.795000000 +0000
@@ -1541,9 +1541,9 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
-"选项已被忽略，曾用于将自定义规则加入防火墙 ( 例： ipv4:filter:/etc/sysconfig/"
+"选项已被忽略，曾用于将自定义规则加入防火墙 ( 例： ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon )"
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/po/zh_TW.po firewalld-0.3.8-magellan/po/zh_TW.po
--- firewalld-0.3.8/po/zh_TW.po	2013-11-05 15:00:59.000000000 +0000
+++ firewalld-0.3.8-magellan/po/zh_TW.po	2013-12-12 11:02:29.817000000 +0000
@@ -1560,9 +1560,9 @@
 #: ../src/firewall-offline-cmd:192
 msgid ""
 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
-"忽略的選項。過去用來將自訂規則加入防火牆中 (範例：ipv4:filter:/etc/sysconfig/"
+"忽略的選項。過去用來將自訂規則加入防火牆中 (範例：ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:196
diff -Naur firewalld-0.3.8/src/firewall-offline-cmd firewalld-0.3.8-magellan/src/firewall-offline-cmd
--- firewalld-0.3.8/src/firewall-offline-cmd	2013-10-25 08:04:10.000000000 +0000
+++ firewalld-0.3.8-magellan/src/firewall-offline-cmd	2013-12-12 10:59:08.541000000 +0000
@@ -189,7 +189,7 @@
                       action="callback", dest="custom_rules", type="rulesfile",
                       metavar=_("[<type>:][<table>:]<filename>"),
                       callback=_append_unique,
-                      help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"))
+                      help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"))
     parser.add_option("--forward-port",
                       action="callback", dest="forward_port",
                       type="forward_port",
@@ -319,7 +319,7 @@
     return _parse_args(parser, args, options)
 
 # system-config-firewall: fw_sysconfig
-CONFIG = '/etc/sysconfig/system-config-firewall'
+CONFIG = '/etc/conf.d/system-config-firewall'
 
 def read_sysconfig_args():
     filename = None