gistfile1.vim

--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -456,7 +456,11 @@ function! s:zen_toString_html(settings, current, type, inline, filters, itemno,
   else
     if inline == 0
       if stridx(','.settings.html.empty_elements.',', ','.current.name.',') != -1
-        let str .= " />\n"
+        if &ft != 'xhtml'
+            let str .= ">\n"
+        else
+            let str .= " />\n"
+        endif
       else
         if stridx(','.settings.html.inline_elements.',', ','.current.name.',') == -1 && len(current.child)
           let str .= ">\n" . inner . '${cursor}</' . current.name . ">\n"
@@ -466,7 +470,11 @@ function! s:zen_toString_html(settings, current, type, inline, filters, itemno,
       endif
     else
       if stridx(','.settings.html.empty_elements.',', ','.current.name.',') != -1
-        let str .= " />"
+        if &ft != 'xhtml'
+            let str .= ">\n"
+        else
+            let str .= " />\n"
+        endif
       else
         let str .= ">" . inner . '${cursor}</' . current.name . ">"
       endif