diff --git a/Makefile b/Makefile
index 299f1810720ee12abaff47b1425603c7e496a879..f297538b1852259dd04214f938690275f4522d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 BASE=rules_shipping
 BASE_ADV=rules_shipping_advanced
 PLUGINTYPE=vmshipment
-VERSION=2.1.1
+VERSION=2.1.2
 
 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html
 PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
 
-TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
+TRANSLATIONS=$(call wildcard,language/en*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) 
 TRANSLATIONS_ADV=$(subst $(BASE),$(BASE_ADV),$(TRANSLATIONS))
 INDEXFILES=language/index.html $(call wildcard,language/**/index.html) $(call wildcard,elements/*.html)
 ELEMENTS=$(call wildcard,elements/*.php) 
@@ -21,8 +21,8 @@ translations: $(TRANSLATIONS)
 	@echo $(TRANSLATIONS_ADV)
 	@cp language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini language/en-GB/en-GB.plg_vmshipment_rules_shipping_advanced.ini
 	@cp language/en-GB/en-GB.plg_vmshipment_rules_shipping.sys.ini language/en-GB/en-GB.plg_vmshipment_rules_shipping_advanced.sys.ini
-	@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.ini
-	@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.sys.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.sys.ini
+# # 	@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.ini
+# # 	@cp language/de-DE/de-DE.plg_vmshipment_rules_shipping.sys.ini language/de-DE/de-DE.plg_vmshipment_rules_shipping_advanced.sys.ini
 
 zip: $(PLUGINFILES) $(TRANSLATIONS) $(ADVANCEDFILES)
 	@echo "Packing all files into distribution file $(ZIPFILE):"
diff --git a/releases/plg_vmshipment_rules_shipping_advanced_v2.1.2.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..37a97d96d2fad971bdd765235eeb0b6909e41b05
Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.2.zip differ
diff --git a/releases/plg_vmshipment_rules_shipping_v2.1.2.zip b/releases/plg_vmshipment_rules_shipping_v2.1.2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a7024b031b989adf30c72784d936a8d2824d3df0
Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.1.2.zip differ
diff --git a/rules_shipping.xml b/rules_shipping.xml
index e200b3c4dc92ec5fa00407effb9456a25c09e1ee..b673f8deaa7a6ac56c5b6853d9443d17fa779ff1 100644
--- a/rules_shipping.xml
+++ b/rules_shipping.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.kainhofer.com</authorUrl>
     <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <description>VMSHIPMENT_RULES_DESC</description>
     <files>
 	<filename plugin="rules_shipping">rules_shipping.php</filename>
diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml
index 6ae7a918e0eaae618ae5287bf87297a1107bf6c5..8b42050f526a29d8ba46babebf51777e61b28866 100644
--- a/rules_shipping_advanced.xml
+++ b/rules_shipping_advanced.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.kainhofer.com</authorUrl>
     <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <description>VMSHIPMENT_RULES_ADV_DESC</description>
     <files>
 	<filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>
diff --git a/rules_shipping_base.php b/rules_shipping_base.php
index 2c2bbe577639c298bc1e5357a67b4ba9fb00c48f..8ab0feeb72695a6f22eba7bd632623af49afcb26 100644
--- a/rules_shipping_base.php
+++ b/rules_shipping_base.php
@@ -197,13 +197,13 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 			$return = $this->displayLogos ($logos) . ' ';
 		}
 		if (!empty($plugin->$plugin_desc)) {
-			$description = '<span class="' . $this->_type . '_description">' . $plugin->$plugin_desc . '</span>';
+			$description = '<span class="' . $this->_type . '_description">' . htmlspecialchars($plugin->$plugin_desc) . '</span>';
 		}
 		$rulename='';
 		if (!empty($plugin->rule_name)) {
-			$rulename=" (".$plugin->rule_name.")";
+			$rulename=" (".htmlspecialchars($plugin->rule_name).")";
 		}
-		$pluginName = $return . '<span class="' . $this->_type . '_name">' . $plugin->$plugin_name . $rulename.'</span>' . $description;
+		$pluginName = $return . '<span class="' . $this->_type . '_name">' . htmlspecialchars($plugin->$plugin_name) . $rulename.'</span>' . $description;
 		return $pluginName;
 	}