diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index 90a650f..c66eab2 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 06-Jan-2011.
+" Last Change: 12-Jan-2011.
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -642,7 +642,7 @@ function! zencoding#expandAbbr(mode) range
       for n in range(a:firstline, a:lastline)
         let lline = getline(n)
         let lpart = substitute(lline, '^\s*', '', '')
-        let expand = substitute(expand, '\$line\$', lpart, '')
+        let expand = join(split(expand, '\$line\$'), lpart)
       endfor
     else
       let str = ''