diff --git a/src/app/code/community/FireGento/GermanSetup/Block/Catalog/Product/Price.php b/src/app/code/community/FireGento/GermanSetup/Block/Catalog/Product/Price.php
index 780b708..a288102 100644
--- a/src/app/code/community/FireGento/GermanSetup/Block/Catalog/Product/Price.php
+++ b/src/app/code/community/FireGento/GermanSetup/Block/Catalog/Product/Price.php
@@ -65,6 +65,8 @@ public function _toHtml()
                 ->toHtml();
             $htmlObject->setHtml($htmlTemplate);
 
+            $this->_addDeliveryTimeHtml($htmlObject);
+
             Mage::dispatchEvent('germansetup_after_product_price',
                 array(
                     'html_obj' => $htmlObject,
@@ -81,6 +83,27 @@ public function _toHtml()
         return $html;
     }
 
+    /**
+     * Add delivery time on category pages only
+     *
+     * @param $htmlObject
+     */
+    protected function _addDeliveryTimeHtml($htmlObject)
+    {
+        if (!Mage::getStoreConfigFlag('catalog/price/display_delivery_time_on_categories')) {
+            return;
+        }
+
+        $pathInfo = Mage::app()->getRequest()->getPathInfo();
+        if (strpos($pathInfo, 'catalog/category/view') !== false
+            || strpos($pathInfo, 'catalogsearch/result') !== false) {
+            if ($this->getProduct()->getDeliveryTime()) {
+                $html = '<p class="delivery-time">' . $this->__('Delivery Time') . ': ' . $this->getProduct()->getDeliveryTime() . '</p>';
+                $htmlObject->setSuffix($html);
+            }
+        }
+    }
+
     /**
      * Read tax rate from current product.
      *
diff --git a/src/app/code/community/FireGento/GermanSetup/Block/Checkout/Information.php b/src/app/code/community/FireGento/GermanSetup/Block/Checkout/Information.php
index 37c0bfd..9236133 100644
--- a/src/app/code/community/FireGento/GermanSetup/Block/Checkout/Information.php
+++ b/src/app/code/community/FireGento/GermanSetup/Block/Checkout/Information.php
@@ -50,17 +50,21 @@ class FireGento_GermanSetup_Block_Checkout_Information extends Mage_Core_Block_T
      */
     public function getCheckoutAdditionalInformation()
     {
-        if (!Mage::getStoreConfigFlag(self::XML_PATH_CHECKOUT_DISPLAY_ADDITIONAL_INFORMATION)) {
-            return false;
+        $additional = '';
+
+        if (Mage::getStoreConfigFlag(self::XML_PATH_CHECKOUT_DISPLAY_ADDITIONAL_INFORMATION)) {
+            $additional = trim(Mage::getStoreConfig(self::XML_PATH_CHECKOUT_ADDITIONAL_INFORMATION));
         }
 
-        $additional = Mage::getStoreConfig(self::XML_PATH_CHECKOUT_ADDITIONAL_INFORMATION);
-        $additional = trim($additional);
+        // Dispatch Event in order to allow adding more additional information texts
+        $additionalObject = new Varien_Object(array('text' => $additional));
+        Mage::dispatchEvent('checkout_additional_information', array('additional' => $additionalObject));
+        $additional = $additionalObject->getText();
 
-        if ($additional) {
-            return $additional;
+        if (!$additional) {
+            return false;
         }
 
-        return false;
+        return $additional;
     }
 }
diff --git a/src/app/code/community/FireGento/GermanSetup/etc/config.xml b/src/app/code/community/FireGento/GermanSetup/etc/config.xml
index 9cb6435..22e415f 100644
--- a/src/app/code/community/FireGento/GermanSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/GermanSetup/etc/config.xml
@@ -243,6 +243,7 @@
         <catalog>
             <price>
                 <display_block_below_price>1</display_block_below_price>
+                <display_delivery_time_on_categories>1</display_delivery_time_on_categories>
                 <cms_page_shipping>lieferung</cms_page_shipping>
             </price>
         </catalog>
diff --git a/src/app/code/community/FireGento/GermanSetup/etc/system.xml b/src/app/code/community/FireGento/GermanSetup/etc/system.xml
index 2e7b1d1..59e4d9f 100644
--- a/src/app/code/community/FireGento/GermanSetup/etc/system.xml
+++ b/src/app/code/community/FireGento/GermanSetup/etc/system.xml
@@ -40,6 +40,15 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </display_block_below_price>
+                        <display_delivery_time_on_categories translate="label,comment" module="germansetup">
+                            <label>Display Delivery time on Category Pages</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>25</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </display_delivery_time_on_categories>
                         <cms_page_shipping translate="label" module="germansetup">
                             <label>CMS Page for Shipping Info</label>
                             <frontend_type>select</frontend_type>
diff --git a/src/app/design/frontend/base/default/layout/germansetup.xml b/src/app/design/frontend/base/default/layout/germansetup.xml
index 1ff8961..fd91c74 100644
--- a/src/app/design/frontend/base/default/layout/germansetup.xml
+++ b/src/app/design/frontend/base/default/layout/germansetup.xml
@@ -1,176 +1,497 @@
 <?xml version="1.0"?>
 <layout version="0.1.0">
 
-	<!--
+    <!--
 	Adding custom product price block
 	-->
     <catalog_category_default>
         <reference name="product_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalog_category_default>
 
     <catalog_category_view>
         <reference name="product_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalog_category_view>
 
     <catalog_category_layered>
         <reference name="product_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalog_category_layered>
 
     <catalog_product_compare_index>
         <reference name="catalog.compare.list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalog_product_compare_index>
 
     <catalogsearch_result_index>
         <reference name="search_result_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalogsearch_result_index>
 
     <catalogsearch_advanced_result>
         <reference name="search_result_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalogsearch_advanced_result>
 
     <tag_product_list>
         <reference name="search_result_list">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </tag_product_list>
 
     <tag_customer_view>
         <reference name="customer_view">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </tag_customer_view>
 
     <default>
         <reference name="wishlist_sidebar">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
         <reference name="catalog_product_price_template">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </default>
 
     <catalog_product_view>
         <reference name="catalog.product.related">
-            <action method="addPriceBlockType"><type>simple</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>virtual</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>grouped</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>downloadable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>configurable</type><block>germansetup/catalog_product_price</block><template>catalog/product/price.phtml</template></action>
-            <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+            <action method="addPriceBlockType">
+                <type>simple</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>virtual</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>grouped</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>downloadable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>configurable</type>
+                <block>germansetup/catalog_product_price</block>
+                <template>catalog/product/price.phtml</template>
+            </action>
+            <action method="addPriceBlockType">
+                <type>bundle</type>
+                <block>germansetup/bundle_catalog_product_price</block>
+                <template>bundle/catalog/product/price.phtml</template>
+            </action>
         </reference>
     </catalog_product_view>
 
     <reference name="product.clone_prices">
-        <action method="addPriceBlockType"><type>bundle</type><block>germansetup/bundle_catalog_product_price</block><template>bundle/catalog/product/view/price.phtml</template></action>
+        <action method="addPriceBlockType">
+            <type>bundle</type>
+            <block>germansetup/bundle_catalog_product_price</block>
+            <template>bundle/catalog/product/view/price.phtml</template>
+        </action>
     </reference>
 
+    <PRODUCT_TYPE_simple>
+        <reference name="product.info.simple.extra">
+            <block type="catalog/product_view_type_simple" name="germansetup.deliverytime"
+                   template="germansetup/delivery_time.phtml"/>
+        </reference>
+    </PRODUCT_TYPE_simple>
+
+    <PRODUCT_TYPE_configurable>
+        <reference name="product.info.configurable.extra">
+            <block type="catalog/product_view_type_configurable" name="germansetup.deliverytime"
+                   template="germansetup/delivery_time.phtml"/>
+        </reference>
+    </PRODUCT_TYPE_configurable>
+
+    <PRODUCT_TYPE_grouped>
+        <reference name="product.info.grouped.extra">
+            <block type="catalog/product_view_type_grouped" name="germansetup.deliverytime"
+                   template="germansetup/delivery_time.phtml"/>
+        </reference>
+    </PRODUCT_TYPE_grouped>
+
+    <PRODUCT_TYPE_virtual>
+        <reference name="product.info.virtual.extra">
+            <block type="catalog/product_view_type_virtual" name="germansetup.deliverytime"
+                   template="germansetup/delivery_time.phtml"/>
+        </reference>
+    </PRODUCT_TYPE_virtual>
+
+    <PRODUCT_TYPE_downloadable>
+        <reference name="product.info.downloadable.extra">
+            <block type="downloadable/catalog_product_view_type" name="germansetup.deliverytime"
+                   template="germansetup/delivery_time.phtml"/>
+        </reference>
+    </PRODUCT_TYPE_downloadable>
 
     <!--
     Changes for Button Loesung
     -->
     <germansetup_frontend_agreements>
         <reference name="root">
-            <action method="setTemplate"><template>page/popup.phtml</template></action>
+            <action method="setTemplate">
+                <template>page/popup.phtml</template>
+            </action>
         </reference>
         <reference name="content">
-            <block type="core/text" name="agreement" />
+            <block type="core/text" name="agreement"/>
         </reference>
     </germansetup_frontend_agreements>
 
     <checkout_onepage_index>
         <reference name="head">
-            <action method="addCss"><stylesheet>css/germansetup/checkout.css</stylesheet></action>
+            <action method="addCss">
+                <stylesheet>css/germansetup/checkout.css</stylesheet>
+            </action>
         </reference>
     </checkout_onepage_index>
 
     <checkout_onepage_review>
-		<reference name="checkout.onepage.agreements">
-            <action method="setTemplate"><template>germansetup/checkout/onepage/agreements.phtml</template></action>
+        <reference name="checkout.onepage.agreements">
+            <action method="setTemplate">
+                <template>germansetup/checkout/onepage/agreements.phtml</template>
+            </action>
         </reference>
         <reference name="root">
-            <action method="unsetChild"><alias>agreements</alias></action>
+            <action method="unsetChild">
+                <alias>agreements</alias>
+            </action>
         </reference>
         <reference name="checkout.onepage.review.info.items.before">
-            <action method="insert"><blockName>checkout.onepage.agreements</blockName></action>
+            <action method="insert">
+                <blockName>checkout.onepage.agreements</blockName>
+            </action>
         </reference>
         <reference name="checkout.onepage.review.info.items.after">
-            <block type="germansetup/checkout_information" name="checkout.onepage.additional" as="additional" template="germansetup/checkout/additional.phtml" />
+            <block type="germansetup/checkout_information" name="checkout.onepage.additional" as="additional"
+                   template="germansetup/checkout/additional.phtml"/>
         </reference>
     </checkout_onepage_review>
 
     <checkout_multishipping_overview>
         <reference name="head">
-            <action method="addCss"><stylesheet>css/germansetup/checkout.css</stylesheet></action>
+            <action method="addCss">
+                <stylesheet>css/germansetup/checkout.css</stylesheet>
+            </action>
         </reference>
         <reference name="checkout_overview">
-			<action method="setTemplate"><name>germansetup/checkout/multishipping/overview.phtml</name></action>
-            <action method="unsetChild"><name>agreements</name></action>
-            <block type="checkout/agreements" name="checkout.multishipping.agreements" as="agreements" template="germansetup/checkout/multishipping/agreements.phtml" />
+            <action method="setTemplate">
+                <name>germansetup/checkout/multishipping/overview.phtml</name>
+            </action>
+            <action method="unsetChild">
+                <name>agreements</name>
+            </action>
+            <block type="checkout/agreements" name="checkout.multishipping.agreements" as="agreements"
+                   template="germansetup/checkout/multishipping/agreements.phtml"/>
         </reference>
         <reference name="checkout.multishipping.overview.items.after">
-            <block type="germansetup/checkout_information" name="checkout.multishipping.additional" as="additional" template="germansetup/checkout/additional.phtml" />
+            <block type="germansetup/checkout_information" name="checkout.multishipping.additional" as="additional"
+                   template="germansetup/checkout/additional.phtml"/>
         </reference>
     </checkout_multishipping_overview>
 </layout>
diff --git a/src/app/design/frontend/base/default/template/germansetup/delivery_time.phtml b/src/app/design/frontend/base/default/template/germansetup/delivery_time.phtml
new file mode 100644
index 0000000..b1e4dc6
--- /dev/null
+++ b/src/app/design/frontend/base/default/template/germansetup/delivery_time.phtml
@@ -0,0 +1,44 @@
+<?php
+/**
+ * This file is part of the FIREGENTO project.
+ *
+ * FireGento_GermanSetup is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This script is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * PHP version 5
+ *
+ * @category  FireGento
+ * @package   FireGento_GermanSetup
+ * @author    FireGento Team <team@firegento.com>
+ * @copyright 2012 FireGento Team (http://www.firegento.de). All rights served.
+ * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ * @version   $Id:$
+ * @since     0.1.0
+ */
+/**
+ * Template for displaying delivery time
+ *
+ * @category  FireGento
+ * @package   FireGento_GermanSetup
+ * @author    FireGento Team <team@firegento.com>
+ * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ * @version   $Id:$
+ * @since     1.2.0
+ */
+
+/**
+ * @var $this Mage_Catalog_Block_Product_View_Abstract
+ */
+?>
+
+<?php if ($this->getProduct()->getDeliveryTime()): ?>
+<p class="delivery-time">
+    <?php echo $this->__('Delivery Time') ?>: <?php echo $this->getProduct()->getDeliveryTime() ?>
+</p>
+<?php endif ?>
diff --git a/src/app/locale/de_DE/FireGento_GermanSetup.csv b/src/app/locale/de_DE/FireGento_GermanSetup.csv
index ec9da87..28d750f 100644
--- a/src/app/locale/de_DE/FireGento_GermanSetup.csv
+++ b/src/app/locale/de_DE/FireGento_GermanSetup.csv
@@ -1,5 +1,6 @@
 "Display Block below Price","Block unterhalb der Preise darstellen"
 "Display tax info and shipping cost link below the price on all pages","Steuerinformationen und Link zur Versandkostenseite auf allen Seiten unterhalb der Preise darstellen"
+"Display Delivery time on Category Pages","Lieferzeit auf Produktübersichtsseiten anzeigen"
 "CMS Page for Shipping Info","CMS-Seite für Versandkosten"
 "Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Zeige ""inkl. Versandkosten"" statt ""zzgl. Versandkosten"""
 "No Page","Keine Seite"
@@ -106,3 +107,5 @@
 "CMS Settings","CMS-Einstellungen"
 "Email Settings","Email-Einstellungen"
 "Tax Settings","Steuer-Einstellungen"
+
+"Delivery Time","Lieferzeit"
\ No newline at end of file