diff --git a/certbot-apache/certbot_apache/augeas_lens/httpd.aug b/certbot-apache/certbot_apache/augeas_lens/httpd.aug
index 697d5de89..07974b364 100644
--- a/certbot-apache/certbot_apache/augeas_lens/httpd.aug
+++ b/certbot-apache/certbot_apache/augeas_lens/httpd.aug
@@ -45,8 +45,8 @@ autoload xfm
let dels (s:string) = del s s
(* deal with continuation lines *)
-let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)/ " "
-let sep_osp = del /([ \t]*|[ \t]*\\\\\r?\n[ \t]*)/ ""
+let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)+/ " "
+let sep_osp = del /([ \t]*|[ \t]*\\\\\r?\n[ \t]*)*/ ""
let sep_eq = del /[ \t]*=[ \t]*/ "="
let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/
diff --git a/certbot-apache/certbot_apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf
new file mode 100644
index 000000000..3f2f96965
--- /dev/null
+++ b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf
@@ -0,0 +1,247 @@
+#ATTENTION!
+#
+#DO NOT MODIFY THIS FILE BECAUSE IT WAS GENERATED AUTOMATICALLY,
+#SO ALL YOUR CHANGES WILL BE LOST THE NEXT TIME THE FILE IS GENERATED.
+
+NameVirtualHost 192.168.100.218:80
+NameVirtualHost 10.128.178.192:80
+
+NameVirtualHost 192.168.100.218:443
+NameVirtualHost 10.128.178.192:443
+
+
+ServerName "254020-web1.example.com"
+ServerAdmin "name@example.com"
+
+DocumentRoot "/tmp"
+
+
+ LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" plesklog
+
+
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" plesklog
+
+
+ TraceEnable off
+
+ServerTokens ProductOnly
+
+
+ AllowOverride "All"
+ Options SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+
+
+php_admin_flag engine off
+
+
+
+php_admin_flag engine off
+
+
+
+
+
+ AllowOverride All
+ Options SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+
+ php_admin_flag engine off
+
+
+ php_admin_flag engine off
+
+
+
+
+ Header add X-Powered-By PleskLin
+
+
+
+ JkWorkersFile "/etc/httpd/conf/workers.properties"
+ JkLogFile /var/log/httpd/mod_jk.log
+ JkLogLevel info
+
+
+#Include "/etc/httpd/conf/plesk.conf.d/ip_default/*.conf"
+
+
+
+ ServerName "default"
+ UseCanonicalName Off
+ DocumentRoot "/tmp"
+ ScriptAlias /cgi-bin/ "/var/www/vhosts/default/cgi-bin"
+
+
+
+ SSLEngine off
+
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+
+
+
+
+
+php_admin_flag engine on
+
+
+
+php_admin_flag engine on
+
+
+
+
+
+
+
+
+
+ ServerName "default-192_168_100_218"
+ UseCanonicalName Off
+ DocumentRoot "/tmp"
+ ScriptAlias /cgi-bin/ "/var/www/vhosts/default/cgi-bin"
+
+
+ SSLEngine on
+ SSLVerifyClient none
+ #SSLCertificateFile "/usr/local/psa/var/certificates/cert-9MgutN"
+
+ #SSLCACertificateFile "/usr/local/psa/var/certificates/cert-s6Wx3P"
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+
+
+
+
+
+php_admin_flag engine on
+
+
+
+php_admin_flag engine on
+
+
+
+
+
+
+ ServerName "default-10_128_178_192"
+ UseCanonicalName Off
+ DocumentRoot "/tmp"
+ ScriptAlias /cgi-bin/ "/var/www/vhosts/default/cgi-bin"
+
+
+ SSLEngine on
+ SSLVerifyClient none
+ #SSLCertificateFile "/usr/local/psa/var/certificates/certxfb6025"
+
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+
+
+
+
+
+php_admin_flag engine on
+
+
+
+php_admin_flag engine on
+
+
+
+
+
+
+
+
+
+
+ DocumentRoot "/tmp"
+ ServerName lists
+ ServerAlias lists.*
+ UseCanonicalName Off
+
+ ScriptAlias "/mailman/" "/usr/lib/mailman/cgi-bin/"
+
+ Alias "/icons/" "/var/www/icons/"
+ Alias "/pipermail/" "/var/lib/mailman/archives/public/"
+
+
+ SSLEngine off
+
+
+
+
+ Options FollowSymLinks
+ Order allow,deny
+ Allow from all
+
+
+
+
+
+
+ DocumentRoot "/tmp"
+ ServerName lists
+ ServerAlias lists.*
+ UseCanonicalName Off
+
+ ScriptAlias "/mailman/" "/usr/lib/mailman/cgi-bin/"
+
+ Alias "/icons/" "/var/www/icons/"
+ Alias "/pipermail/" "/var/lib/mailman/archives/public/"
+
+ SSLEngine on
+ SSLVerifyClient none
+ #SSLCertificateFile "/usr/local/psa/var/certificates/certxfb6025"
+
+
+
+ Options FollowSymLinks
+ Order allow,deny
+ Allow from all
+
+
+
+
+
+
+ RPAFproxy_ips 192.168.100.218 10.128.178.192
+
+
+ RPAFproxy_ips 192.168.100.218 10.128.178.192
+