diff --git a/src/app/code/community/FireGento/GermanSetup/etc/config.xml b/src/app/code/community/FireGento/GermanSetup/etc/config.xml
index 22e415f..00313ed 100644
--- a/src/app/code/community/FireGento/GermanSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/GermanSetup/etc/config.xml
@@ -261,6 +261,9 @@
             <options>
                 <additional_information><![CDATA[Zusätzlich können noch Kosten oder Steuern anfallen, die nicht über uns abgeführt bzw. von uns in Rechnung gestellt werden.]]></additional_information>
             </options>
+            <cart>
+                <hide_shipping>0</hide_shipping>
+            </cart>
         </checkout>
         <customer>
             <address_templates>
diff --git a/src/app/code/community/FireGento/GermanSetup/etc/system.xml b/src/app/code/community/FireGento/GermanSetup/etc/system.xml
index 59e4d9f..96e6bb8 100644
--- a/src/app/code/community/FireGento/GermanSetup/etc/system.xml
+++ b/src/app/code/community/FireGento/GermanSetup/etc/system.xml
@@ -331,6 +331,19 @@
                         </additional_information>
         			</fields>
         		</options>
+        		<cart>
+        			<fields>
+                        <hide_shipping translate="label" module="germansetup">
+                            <label>Hide estimated shipping costs in cart</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>500</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </hide_shipping>
+        			</fields>
+        		</cart>
         	</groups>
         </checkout>
         <google>
diff --git a/src/app/design/frontend/base/default/layout/germansetup.xml b/src/app/design/frontend/base/default/layout/germansetup.xml
index fd91c74..dfb8f84 100644
--- a/src/app/design/frontend/base/default/layout/germansetup.xml
+++ b/src/app/design/frontend/base/default/layout/germansetup.xml
@@ -443,6 +443,14 @@
         </reference>
     </germansetup_frontend_agreements>
 
+    <checkout_cart_index>
+        <reference name="checkout.cart">
+            <action method="unsetChild" ifconfig="checkout/cart/hide_shipping">
+                <name>shipping</name>
+            </action>
+        </reference>
+    </checkout_cart_index>
+
     <checkout_onepage_index>
         <reference name="head">
             <action method="addCss">
diff --git a/src/app/locale/de_DE/FireGento_GermanSetup.csv b/src/app/locale/de_DE/FireGento_GermanSetup.csv
index 28d750f..dcf5729 100644
--- a/src/app/locale/de_DE/FireGento_GermanSetup.csv
+++ b/src/app/locale/de_DE/FireGento_GermanSetup.csv
@@ -108,4 +108,5 @@
 "Email Settings","Email-Einstellungen"
 "Tax Settings","Steuer-Einstellungen"
 
-"Delivery Time","Lieferzeit"
\ No newline at end of file
+"Delivery Time","Lieferzeit"
+"Hide estimated shipping costs in cart","Geschätzte Versandkosten im Warenkorb verstecken"
\ No newline at end of file