diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index c66eab2..09d0918 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 12-Jan-2011.
+" Last Change: 14-Jan-2011.
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -642,7 +642,10 @@ function! zencoding#expandAbbr(mode) range
       for n in range(a:firstline, a:lastline)
         let lline = getline(n)
         let lpart = substitute(lline, '^\s*', '', '')
-        let expand = join(split(expand, '\$line\$'), lpart)
+        let pos = stridx(expand, "$line$")
+        if pos != -1
+          let expand = expand[:pos-1] . lpart . expand[pos+6:]
+        endif
       endfor
     else
       let str = ''
diff --git a/plugin/zencoding.vim b/plugin/zencoding.vim
index f6e06aa..4f0788c 100644
--- a/plugin/zencoding.vim
+++ b/plugin/zencoding.vim
@@ -1,8 +1,8 @@
 "=============================================================================
 " File: zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 13-Jan-2011.
-" Version: 0.51
+" Last Change: 14-Jan-2011.
+" Version: 0.52
 " WebPage: http://github.com/mattn/zencoding-vim
 " Description: vim plugins for HTML and CSS hi-speed coding.
 " SeeAlso: http://code.google.com/p/zen-coding/
diff --git a/zencoding.vim.vimup b/zencoding.vim.vimup
index de78183..9298e0f 100644
--- a/zencoding.vim.vimup
+++ b/zencoding.vim.vimup
@@ -98,6 +98,8 @@ install_details: |
   # git clone http://github.com/mattn/zencoding-vim.git
 
 versions:
+- '0.52': |
+   [fix] broken wrap expanding.
 - '0.51': |
    This is an upgrade for ZenCoding.vim:
    [fix] wrap expanding with '&'.