diff --git a/app/code/community/IntegerNet/Autoshipping/Block/Tax/Checkout/Shipping.php b/app/code/community/IntegerNet/Autoshipping/Block/Tax/Checkout/Shipping.php
new file mode 100644
index 0000000..34594f0
--- /dev/null
+++ b/app/code/community/IntegerNet/Autoshipping/Block/Tax/Checkout/Shipping.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * integer_net Autoshipping Module
+ *
+ * @category   IntegerNet
+ * @package    IntegerNet_Autoshipping
+ * @copyright  Copyright (c) 2013 integer_net GmbH (http://www.integer-net.de/)
+ * @license    http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ * @author     Andreas von Studnitz <avs@integer-net.de>
+ */
+class IntegerNet_Autoshipping_Block_Tax_Checkout_Shipping extends Mage_Tax_Block_Checkout_Shipping {
+
+    protected $_template = 'integernet/tax/checkout/shipping.phtml';
+
+}
\ No newline at end of file
diff --git a/app/code/community/IntegerNet/Autoshipping/etc/config.xml b/app/code/community/IntegerNet/Autoshipping/etc/config.xml
index aeb47bc..97bad85 100644
--- a/app/code/community/IntegerNet/Autoshipping/etc/config.xml
+++ b/app/code/community/IntegerNet/Autoshipping/etc/config.xml
@@ -39,6 +39,11 @@
             <autoshipping>
                 <class>IntegerNet_Autoshipping_Block</class>
             </autoshipping>
+            <tax>
+                <rewrite>
+                    <checkout_shipping>IntegerNet_Autoshipping_Block_Tax_Checkout_Shipping</checkout_shipping>
+                </rewrite>
+            </tax>
         </blocks>
     </global>
     <frontend>
diff --git a/app/design/frontend/base/default/template/integernet/tax/checkout/shipping.phtml b/app/design/frontend/base/default/template/integernet/tax/checkout/shipping.phtml
new file mode 100644
index 0000000..16d5023
--- /dev/null
+++ b/app/design/frontend/base/default/template/integernet/tax/checkout/shipping.phtml
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+/**
+ * @var $this Mage_Tax_Block_Checkout_Shipping
+ * @see Mage_Tax_Block_Checkout_Shipping
+ */
+?>
+<?php if ($this->displayBoth()):?>
+<tr>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
+        <?php echo $this->getExcludeTaxLabel() ?>
+    </td>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right">
+        <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
+    </td>
+</tr>
+<tr>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
+        <?php echo $this->getIncludeTaxLabel() ?>
+    </td>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right">
+        <?php echo $this->helper('checkout')->formatPrice($this->getShippingIncludeTax()) ?>
+    </td>
+</tr>
+<?php elseif($this->displayIncludeTax()) : ?>
+<tr>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
+        <?php echo $this->getTotal()->getTitle() ?>
+    </td>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right">
+        <?php echo $this->helper('checkout')->formatPrice($this->getShippingIncludeTax()) ?>
+    </td>
+</tr>
+<?php else:?>
+<tr>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
+        <?php echo $this->getTotal()->getTitle() ?>
+    </td>
+    <td style="<?php echo $this->getStyle() ?>" class="a-right">
+        <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
+    </td>
+</tr>
+<?php endif;?>