diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c4c12d1b..8dbe78cc 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -53,6 +53,8 @@ public function getConfigTreeBuilder()
                 ->scalarNode('password')->defaultNull()->end()
                 ->scalarNode('host')->defaultValue('localhost')->end()
                 ->scalarNode('port')->defaultFalse()->end()
+                ->scalarNode('timeout')->defaultValue(30)->end()
+                ->scalarNode('source_ip')->defaultNull()->end()
                 ->scalarNode('encryption')
                     ->defaultNull()
                     ->validate()
diff --git a/DependencyInjection/SwiftmailerExtension.php b/DependencyInjection/SwiftmailerExtension.php
index 86e0b293..ef581911 100644
--- a/DependencyInjection/SwiftmailerExtension.php
+++ b/DependencyInjection/SwiftmailerExtension.php
@@ -76,7 +76,7 @@ public function load(array $configs, ContainerBuilder $container)
             $config['port'] = 'ssl' === $config['encryption'] ? 465 : 25;
         }
 
-        foreach (array('encryption', 'port', 'host', 'username', 'password', 'auth_mode') as $key) {
+        foreach (array('encryption', 'port', 'host', 'username', 'password', 'auth_mode', 'timeout', 'source_ip') as $key) {
             $container->setParameter('swiftmailer.transport.smtp.'.$key, $config[$key]);
         }
 
diff --git a/Resources/config/schema/swiftmailer-1.0.xsd b/Resources/config/schema/swiftmailer-1.0.xsd
index cc896d01..9bc89ef4 100644
--- a/Resources/config/schema/swiftmailer-1.0.xsd
+++ b/Resources/config/schema/swiftmailer-1.0.xsd
@@ -19,6 +19,8 @@
     <xsd:attribute name="port" type="xsd:string" />
     <xsd:attribute name="encryption" type="encryption" />
     <xsd:attribute name="auth-mode" type="auth_mode" />
+    <xsd:attribute name="timeout" type="xsd:string"/>
+    <xsd:attribute name="source-ip" type="xsd:string"/>
     <xsd:attribute name="transport" type="xsd:string" />
     <xsd:attribute name="type" type="xsd:string" />
     <xsd:attribute name="delivery-address" type="xsd:string" />
diff --git a/Resources/config/smtp.xml b/Resources/config/smtp.xml
index 7100f47a..fafa8aed 100644
--- a/Resources/config/smtp.xml
+++ b/Resources/config/smtp.xml
@@ -22,6 +22,8 @@
             <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>
             <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>
             <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>
+            <call method="setTimeout"><argument>%swiftmailer.transport.smtp.timeout%</argument></call>
+            <call method="setSourceIp"><argument>%swiftmailer.transport.smtp.source_ip%</argument></call>
         </service>
     </services>
 </container>