diff --git a/app/code/community/Fooman/EmailAttachments/Model/Observer.php b/app/code/community/Fooman/EmailAttachments/Model/Observer.php
index 50e2831..f63b973 100644
--- a/app/code/community/Fooman/EmailAttachments/Model/Observer.php
+++ b/app/code/community/Fooman/EmailAttachments/Model/Observer.php
@@ -200,7 +200,9 @@ public function beforeSendShipment($observer)
             Mage::helper('emailattachments')->addAttachment(
                 $pdf, $mailTemplate, $this->getShipmentAttachmentName($shipment)
             );
-            /*
+        }
+
+        if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachinvoicepdf', $storeId)) {
             $pdf = Mage::getModel('sales/order_pdf_invoice')->getPdf(
                 $shipment->getOrder()->getInvoiceCollection()
             );
@@ -209,7 +211,6 @@ public function beforeSendShipment($observer)
                 $mailTemplate,
                 Mage::helper('sales')->__('Invoices for Order') . "_" . $shipment->getOrder()->getIncrementId()
             );
-            */
         }
 
         if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachagreement', $storeId)) {
diff --git a/app/code/community/Fooman/EmailAttachments/etc/system.xml b/app/code/community/Fooman/EmailAttachments/etc/system.xml
index 54961f8..b46fe58 100644
--- a/app/code/community/Fooman/EmailAttachments/etc/system.xml
+++ b/app/code/community/Fooman/EmailAttachments/etc/system.xml
@@ -328,7 +328,7 @@
                             <label>Attach Terms and Conditions</label>
                             <tooltip><![CDATA[When set to Yes, your Terms and Conditions pdf document
                                 (from <b>Sales &gt; Terms and Conditions</b>) will be automatically attached to the email. Terms
-                                and conditions as html and text files are not supported.]]></tooltip> 
+                                and conditions as html and text files are not supported.]]></tooltip>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
                             <sort_order>70</sort_order>
@@ -411,6 +411,17 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </attachpdf>
+                        <attachinvoicepdf translate="label">
+                            <label>Attach Invoice as PDF</label>
+                            <tooltip>When set to Yes, your invoice pdf document will be
+                                automatically attached to the invoice email.</tooltip>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>60</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </attachinvoicepdf>
                         <attachagreement translate="label">
                             <label>Attach Terms and Conditions</label>
                             <tooltip><![CDATA[When set to Yes, your Terms and Conditions pdf document