diff -Naur firewalld-0.3.10/config/firewalld.init firewalld-0.3.10-magellan/config/firewalld.init
--- firewalld-0.3.10/config/firewalld.init	2013-05-10 10:50:44.000000000 +0000
+++ firewalld-0.3.10-magellan/config/firewalld.init	2014-07-01 13:59:43.276000000 +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.10/config/firewalld.service.in firewalld-0.3.10-magellan/config/firewalld.service.in
--- firewalld-0.3.10/config/firewalld.service.in	2013-05-10 10:50:44.000000000 +0000
+++ firewalld-0.3.10-magellan/config/firewalld.service.in	2014-07-01 13:59:25.860000000 +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.10/config/Makefile.am firewalld-0.3.10-magellan/config/Makefile.am
--- firewalld-0.3.10/config/Makefile.am	2014-05-28 15:56:56.000000000 +0000
+++ firewalld-0.3.10-magellan/config/Makefile.am	2014-07-01 13:58:05.460000000 +0000
@@ -164,12 +164,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.10/config/Makefile.in firewalld-0.3.10-magellan/config/Makefile.in
--- firewalld-0.3.10/config/Makefile.in	2014-05-28 16:24:47.000000000 +0000
+++ firewalld-0.3.10-magellan/config/Makefile.in	2014-07-01 13:59:02.949000000 +0000
@@ -761,12 +761,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.10/doc/man/man1/firewall-offline-cmd.1 firewalld-0.3.10-magellan/doc/man/man1/firewall-offline-cmd.1
--- firewalld-0.3.10/doc/man/man1/firewall-offline-cmd.1	2014-05-28 16:24:53.000000000 +0000
+++ firewalld-0.3.10-magellan/doc/man/man1/firewall-offline-cmd.1	2014-07-01 13:55:39.843000000 +0000
@@ -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.10/doc/xml/firewall-offline-cmd.xml firewalld-0.3.10-magellan/doc/xml/firewall-offline-cmd.xml
--- firewalld-0.3.10/doc/xml/firewall-offline-cmd.xml	2014-05-15 11:46:34.000000000 +0000
+++ firewalld-0.3.10-magellan/doc/xml/firewall-offline-cmd.xml	2014-07-01 13:55:18.365000000 +0000
@@ -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.10/firewalld.spec firewalld-0.3.10-magellan/firewalld.spec
--- firewalld-0.3.10/firewalld.spec	2014-05-28 16:55:40.000000000 +0000
+++ firewalld-0.3.10-magellan/firewalld.spec	2014-07-01 13:54:50.204000000 +0000
@@ -128,7 +128,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.10/po/as.po firewalld-0.3.10-magellan/po/as.po
--- firewalld-0.3.10/po/as.po	2014-05-28 17:03:49.000000000 +0000
+++ firewalld-0.3.10-magellan/po/as.po	2014-07-01 14:00:45.926000000 +0000
@@ -1564,10 +1564,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "উপেক্ষিত বিকল্প। ফায়াৰৱালত স্বনিৰ্বাচিত নিয়মসমূহ যোগ কৰাৰ বাবে ব্যৱহাৰ কৰা "
-#~ "হৈছিল (উদাহৰণস্বৰূপ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "হৈছিল (উদাহৰণস্বৰূপ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/bn_IN.po firewalld-0.3.10-magellan/po/bn_IN.po
--- firewalld-0.3.10/po/bn_IN.po	2014-05-28 17:03:49.000000000 +0000
+++ firewalld-0.3.10-magellan/po/bn_IN.po	2014-07-01 14:00:45.934000000 +0000
@@ -1566,10 +1566,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "উপেক্ষিত বিকল্প। ফায়ারওয়ালে স্বনির্ধারিত নিয়ম যোগ করতে ব্যবহার করা হয়েছে "
-#~ "(উদাহরণ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "(উদাহরণ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/de.po firewalld-0.3.10-magellan/po/de.po
--- firewalld-0.3.10/po/de.po	2014-05-28 17:03:50.000000000 +0000
+++ firewalld-0.3.10-magellan/po/de.po	2014-07-01 14:00:45.968000000 +0000
@@ -1626,10 +1626,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "Unberücksichtigte Option. Dies wurde benutzt, um benutzerdefinierte "
-#~ "Regeln zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/sysconfig/"
+#~ "Regeln zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/conf.d/"
 #~ "ipv4_filter_addon)"
 
 #~ msgid ""
diff -Naur firewalld-0.3.10/po/en_GB.po firewalld-0.3.10-magellan/po/en_GB.po
--- firewalld-0.3.10/po/en_GB.po	2014-05-28 17:03:50.000000000 +0000
+++ firewalld-0.3.10-magellan/po/en_GB.po	2014-07-01 14:00:45.976000000 +0000
@@ -1515,10 +1515,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "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)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/es.po firewalld-0.3.10-magellan/po/es.po
--- firewalld-0.3.10/po/es.po	2014-05-28 17:03:50.000000000 +0000
+++ firewalld-0.3.10-magellan/po/es.po	2014-07-01 14:00:45.984000000 +0000
@@ -1595,10 +1595,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ 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)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/gu.po firewalld-0.3.10-magellan/po/gu.po
--- firewalld-0.3.10/po/gu.po	2014-05-28 17:03:50.000000000 +0000
+++ firewalld-0.3.10-magellan/po/gu.po	2014-07-01 14:00:46.006000000 +0000
@@ -1552,10 +1552,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "અવગણેલ વિકલ્પ. ફાયરવોલમાં વૈવિધ્ય નિયમોનું વાપરેલ હતુ (ઉદાહરણ: ipv4:filter:/etc/"
-#~ "sysconfig/ipv4_filter_addon)"
+#~ "conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/hi.po firewalld-0.3.10-magellan/po/hi.po
--- firewalld-0.3.10/po/hi.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/hi.po	2014-07-01 14:00:46.014000000 +0000
@@ -1551,10 +1551,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "अनदेखा विकल्प. फ़ायरवॉल में पसंदीदा नियम जोड़ने के लिए प्रयुक्त (उदाहरण: ipv4:filter:/"
-#~ "etc/sysconfig/ipv4_filter_addon)"
+#~ "etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/it.po firewalld-0.3.10-magellan/po/it.po
--- firewalld-0.3.10/po/it.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/it.po	2014-07-01 14:00:46.029000000 +0000
@@ -1604,10 +1604,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "Opzione ignorata. E' utilizzata per aggiungere regole personalizzate per "
-#~ "il firewall (Esempio : ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "il firewall (Esempio : ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/ja.po firewalld-0.3.10-magellan/po/ja.po
--- firewalld-0.3.10/po/ja.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/ja.po	2014-07-01 14:00:46.037000000 +0000
@@ -1586,10 +1586,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "無視されたオプション、カスタムルールをファイアウォールに追加するために使用"
-#~ "されました (例: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)。"
+#~ "されました (例: ipv4:filter:/etc/conf.d/ipv4_filter_addon)。"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/kn.po firewalld-0.3.10-magellan/po/kn.po
--- firewalld-0.3.10/po/kn.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/kn.po	2014-07-01 14:00:46.046000000 +0000
@@ -1578,10 +1578,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "ಕಡೆಗಣಿಸಲಾದ ಆಯ್ಕೆ.. ಫೈರ್ವಾಲ್‌ಗೆ ಅಗತ್ಯಾನುಗಣವಾದ ನಿಯಮಗಳನ್ನು ಸೇರಿಸಲು ಇದನ್ನು "
-#~ "ಬಳಸಲಾಗಿತ್ತು (ಉದಾಹರಣೆಗೆ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "ಬಳಸಲಾಗಿತ್ತು (ಉದಾಹರಣೆಗೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/ko.po firewalld-0.3.10-magellan/po/ko.po
--- firewalld-0.3.10/po/ko.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/ko.po	2014-07-01 14:00:46.054000000 +0000
@@ -1568,10 +1568,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "무시된 옵션입니다. 방화벽에 사용자 지정 규칙을 추가하기 위해 사용되었습니"
-#~ "다 (예: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "다 (예: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/ml.po firewalld-0.3.10-magellan/po/ml.po
--- firewalld-0.3.10/po/ml.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/ml.po	2014-07-01 14:00:46.064000000 +0000
@@ -1565,10 +1565,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "ഉപേക്ഷിച്ച ഐച്ഛികം. ഫയര്‍വോളിനു് യഥേഷ്ടമുള്ള നിയമങ്ങള്‍ ചേര്‍ക്കുവാന്‍ ഉപയോഗിച്ചിരിയ്ക്കുന്നു "
-#~ "(ഉദാഹരണത്തിനു്: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "(ഉദാഹരണത്തിനു്: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/mr.po firewalld-0.3.10-magellan/po/mr.po
--- firewalld-0.3.10/po/mr.po	2014-05-28 17:03:51.000000000 +0000
+++ firewalld-0.3.10-magellan/po/mr.po	2014-07-01 14:00:46.072000000 +0000
@@ -1557,10 +1557,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "दुर्लक्ष केलेले पर्याय. फायरवॉलकरिता पसंतीचे रूल्स समाविष्ट करण्यासाठी वापरले गेले "
-#~ "(उदाहरणार्थ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "(उदाहरणार्थ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/nl.po firewalld-0.3.10-magellan/po/nl.po
--- firewalld-0.3.10/po/nl.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/nl.po	2014-07-01 14:00:46.081000000 +0000
@@ -1590,10 +1590,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ 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)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/or.po firewalld-0.3.10-magellan/po/or.po
--- firewalld-0.3.10/po/or.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/or.po	2014-07-01 14:00:46.087000000 +0000
@@ -1556,10 +1556,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "ଅଗ୍ରହଣୀୟ ବିକଳ୍ପ। ଇଚ୍ଛାରୂପଣ ନିୟମାବଳୀକୁ ଫାୟାରୱାଲରେ  ଯୋଗ କରିବା ପାଇଁ ବ୍ୟବହାର କରିଥାଏ "
-#~ "(ଉଦାହରଣ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "(ଉଦାହରଣ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/pa.po firewalld-0.3.10-magellan/po/pa.po
--- firewalld-0.3.10/po/pa.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/pa.po	2014-07-01 14:00:46.093000000 +0000
@@ -1555,10 +1555,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "ਅਣਗੌਲੀ ਚੋਣ। ਫਾਇਰਵਾਲ ਲਈ ਚੁਣਿੰਦਾ ਨਿਯਮ ਜੋੜਨ ਲਈ ਵਰਤੀ ਗਈ ਸੀ (ਉਦਾਹਰਣ: ipv4:filter:/"
-#~ "etc/sysconfig/ipv4_filter_addon)"
+#~ "etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/pl.po firewalld-0.3.10-magellan/po/pl.po
--- firewalld-0.3.10/po/pl.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/pl.po	2014-07-01 14:00:46.099000000 +0000
@@ -1551,10 +1551,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ 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)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/pt_BR.po firewalld-0.3.10-magellan/po/pt_BR.po
--- firewalld-0.3.10/po/pt_BR.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/pt_BR.po	2014-07-01 14:00:46.105000000 +0000
@@ -1611,10 +1611,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ 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)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/ru.po firewalld-0.3.10-magellan/po/ru.po
--- firewalld-0.3.10/po/ru.po	2014-05-28 17:03:52.000000000 +0000
+++ firewalld-0.3.10-magellan/po/ru.po	2014-07-01 14:00:46.116000000 +0000
@@ -1575,10 +1575,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "Игнорируемый параметр. Использовался для добавления дополнительных правил "
-#~ "межсетевого экрана. Пример:  ipv4:filter:/etc/sysconfig/ipv4_filter_addon"
+#~ "межсетевого экрана. Пример:  ipv4:filter:/etc/conf.d/ipv4_filter_addon"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/ta.po firewalld-0.3.10-magellan/po/ta.po
--- firewalld-0.3.10/po/ta.po	2014-05-28 17:03:53.000000000 +0000
+++ firewalld-0.3.10-magellan/po/ta.po	2014-07-01 14:00:46.142000000 +0000
@@ -1579,10 +1579,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "விருப்பம் புறக்கணிக்கப்பட்டது. ஃபயர்வாலுக்கு தனிப்பயன் விதியைச் சேர்க்கப் "
-#~ "பயன்படுத்தப்பட்டது (எடுத்துக்காட்டு: ipv4:filter:/etc/sysconfig/"
+#~ "பயன்படுத்தப்பட்டது (எடுத்துக்காட்டு: ipv4:filter:/etc/conf.d/"
 #~ "ipv4_filter_addon)"
 
 #~ msgid ""
diff -Naur firewalld-0.3.10/po/te.po firewalld-0.3.10-magellan/po/te.po
--- firewalld-0.3.10/po/te.po	2014-05-28 17:03:53.000000000 +0000
+++ firewalld-0.3.10-magellan/po/te.po	2014-07-01 14:00:46.148000000 +0000
@@ -1554,10 +1554,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "విస్మరించిన ఐచ్చికం. ఫైర్‌వాల్‌కు వినియోగదారి మలచిన నియమాలు జతచేయుటకు వుపయోగించబడెను (ఉదాహరణ: ipv4:"
-#~ "filter:/etc/sysconfig/ipv4_filter_addon)"
+#~ "filter:/etc/conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/uk.po firewalld-0.3.10-magellan/po/uk.po
--- firewalld-0.3.10/po/uk.po	2014-05-28 17:03:53.000000000 +0000
+++ firewalld-0.3.10-magellan/po/uk.po	2014-07-01 14:00:46.160000000 +0000
@@ -1589,10 +1589,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "Ігнорований параметр. Використовувався для додавання нетипових правил "
-#~ "обробки брандмауером (Приклад: ipv4:filter:/etc/sysconfig/"
+#~ "обробки брандмауером (Приклад: ipv4:filter:/etc/conf.d/"
 #~ "ipv4_filter_addon)"
 
 #~ msgid ""
diff -Naur firewalld-0.3.10/po/zh_CN.po firewalld-0.3.10-magellan/po/zh_CN.po
--- firewalld-0.3.10/po/zh_CN.po	2014-05-28 17:03:53.000000000 +0000
+++ firewalld-0.3.10-magellan/po/zh_CN.po	2014-07-01 14:00:46.165000000 +0000
@@ -1533,10 +1533,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "选项已被忽略，曾用于将自定义规则加入防火墙 ( 例： ipv4:filter:/etc/"
-#~ "sysconfig/ipv4_filter_addon )"
+#~ "conf.d/ipv4_filter_addon )"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/po/zh_TW.po firewalld-0.3.10-magellan/po/zh_TW.po
--- firewalld-0.3.10/po/zh_TW.po	2014-05-28 17:03:53.000000000 +0000
+++ firewalld-0.3.10-magellan/po/zh_TW.po	2014-07-01 14:00:46.171000000 +0000
@@ -1539,10 +1539,10 @@
 
 #~ msgid ""
 #~ "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)"
 #~ msgstr ""
 #~ "忽略的選項。過去用來將自訂規則加入防火牆中 (範例：ipv4:filter:/etc/"
-#~ "sysconfig/ipv4_filter_addon)"
+#~ "conf.d/ipv4_filter_addon)"
 
 #~ msgid ""
 #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:"
diff -Naur firewalld-0.3.10/src/firewall-offline-cmd firewalld-0.3.10-magellan/src/firewall-offline-cmd
--- firewalld-0.3.10/src/firewall-offline-cmd	2014-05-15 11:46:34.000000000 +0000
+++ firewalld-0.3.10-magellan/src/firewall-offline-cmd	2014-07-01 13:54:00.172000000 +0000
@@ -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)