diff --git a/install/debian/7/exim/exim4.conf.template b/install/debian/7/exim/exim4.conf.template
index d83af2152..c0290afba 100644
--- a/install/debian/7/exim/exim4.conf.template
+++ b/install/debian/7/exim/exim4.conf.template
@@ -11,7 +11,7 @@
 disable_ipv6=true
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -38,8 +38,6 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
 
@@ -204,6 +202,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/debian/8/exim/exim4.conf.template b/install/debian/8/exim/exim4.conf.template
index bfb98e0b8..8f5905170 100644
--- a/install/debian/8/exim/exim4.conf.template
+++ b/install/debian/8/exim/exim4.conf.template
@@ -9,12 +9,10 @@
 #CLAMD =  yes
 
 disable_ipv6=true
-add_environment=<; PATH=/bin:/usr/bin
-keep_environment=
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/debian/9/exim/exim4.conf.template b/install/debian/9/exim/exim4.conf.template
index bfb98e0b8..8f5905170 100644
--- a/install/debian/9/exim/exim4.conf.template
+++ b/install/debian/9/exim/exim4.conf.template
@@ -9,12 +9,10 @@
 #CLAMD =  yes
 
 disable_ipv6=true
-add_environment=<; PATH=/bin:/usr/bin
-keep_environment=
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/5/exim/exim-smarthost.conf b/install/rhel/5/exim/exim-smarthost.conf
index 086ca6507..267aa5c8e 100644
--- a/install/rhel/5/exim/exim-smarthost.conf
+++ b/install/rhel/5/exim/exim-smarthost.conf
@@ -10,7 +10,7 @@
 
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -37,8 +37,6 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
 
@@ -206,6 +204,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/5/exim/exim.conf b/install/rhel/5/exim/exim.conf
index c1793b910..142b161cc 100644
--- a/install/rhel/5/exim/exim.conf
+++ b/install/rhel/5/exim/exim.conf
@@ -10,7 +10,7 @@
 
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -37,8 +37,6 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
 
@@ -203,6 +201,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/6/exim/exim-smarthost.conf b/install/rhel/6/exim/exim-smarthost.conf
index 086ca6507..2b5868a2d 100644
--- a/install/rhel/6/exim/exim-smarthost.conf
+++ b/install/rhel/6/exim/exim-smarthost.conf
@@ -10,7 +10,7 @@
 
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -37,10 +37,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -206,6 +207,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/6/exim/exim.conf b/install/rhel/6/exim/exim.conf
index 50fd86510..01c7062db 100644
--- a/install/rhel/6/exim/exim.conf
+++ b/install/rhel/6/exim/exim.conf
@@ -11,7 +11,7 @@
 disable_ipv6=true
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -38,10 +38,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -204,6 +205,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/7/exim/exim-smarthost.conf b/install/rhel/7/exim/exim-smarthost.conf
index 086ca6507..2b5868a2d 100644
--- a/install/rhel/7/exim/exim-smarthost.conf
+++ b/install/rhel/7/exim/exim-smarthost.conf
@@ -10,7 +10,7 @@
 
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -37,10 +37,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -206,6 +207,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/rhel/7/exim/exim.conf b/install/rhel/7/exim/exim.conf
index 707756c06..54d50d6a6 100644
--- a/install/rhel/7/exim/exim.conf
+++ b/install/rhel/7/exim/exim.conf
@@ -13,7 +13,7 @@ keep_environment =
 disable_ipv6=true
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf
 no_local_from_check
@@ -40,10 +40,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -206,6 +207,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/12.04/exim/exim4.conf.template b/install/ubuntu/12.04/exim/exim4.conf.template
index fc346486f..94f597849 100644
--- a/install/ubuntu/12.04/exim/exim4.conf.template
+++ b/install/ubuntu/12.04/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,10 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +205,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/12.10/exim/exim4.conf.template b/install/ubuntu/12.10/exim/exim4.conf.template
index fc346486f..94f597849 100644
--- a/install/ubuntu/12.10/exim/exim4.conf.template
+++ b/install/ubuntu/12.10/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,10 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +205,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/13.04/exim/exim4.conf.template b/install/ubuntu/13.04/exim/exim4.conf.template
index fc346486f..94f597849 100644
--- a/install/ubuntu/13.04/exim/exim4.conf.template
+++ b/install/ubuntu/13.04/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,10 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +205,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/13.10/exim/exim4.conf.template b/install/ubuntu/13.10/exim/exim4.conf.template
index fc346486f..94f597849 100644
--- a/install/ubuntu/13.10/exim/exim4.conf.template
+++ b/install/ubuntu/13.10/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,10 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +205,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/14.04/exim/exim4.conf.template b/install/ubuntu/14.04/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/14.04/exim/exim4.conf.template
+++ b/install/ubuntu/14.04/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/14.10/exim/exim4.conf.template b/install/ubuntu/14.10/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/14.10/exim/exim4.conf.template
+++ b/install/ubuntu/14.10/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/15.04/exim/exim4.conf.template b/install/ubuntu/15.04/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/15.04/exim/exim4.conf.template
+++ b/install/ubuntu/15.04/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/15.10/exim/exim4.conf.template b/install/ubuntu/15.10/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/15.10/exim/exim4.conf.template
+++ b/install/ubuntu/15.10/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/16.04/exim/exim4.conf.template b/install/ubuntu/16.04/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/16.04/exim/exim4.conf.template
+++ b/install/ubuntu/16.04/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward:
diff --git a/install/ubuntu/16.10/exim/exim4.conf.template b/install/ubuntu/16.10/exim/exim4.conf.template
index fc346486f..5723058d4 100644
--- a/install/ubuntu/16.10/exim/exim4.conf.template
+++ b/install/ubuntu/16.10/exim/exim4.conf.template
@@ -8,13 +8,11 @@
 #SPAM_SCORE = 50
 #CLAMD =  yes
 
-add_environment = <; PATH=/bin:/usr/bin
-keep_environment =
 disable_ipv6 = true
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
-hostlist relay_from_hosts = 127.0.0.1
+hostlist relay_from_hosts = localhost
 hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf
 hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf
 no_local_from_check
@@ -41,10 +39,11 @@ daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+prdr_enable = true
 ignore_bounce_errors_after = 2d
 timeout_frozen_after = 7d
+keep_environment = ^LDAP
+add_environment = PATH=/usr/bin::/bin
 
 DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem
@@ -207,6 +206,7 @@ dnslookup:
   driver = dnslookup
   domains = !+local_domains
   transport = remote_smtp
+  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 userforward: