diff --git a/autoload/neocomplcache/sources/snippets_complete.vim b/autoload/neocomplcache/sources/snippets_complete.vim
index e2ea950..dff55b8 100644
--- a/autoload/neocomplcache/sources/snippets_complete.vim
+++ b/autoload/neocomplcache/sources/snippets_complete.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: snippets_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 17 Mar 2012.
+" Last Modified: 19 Mar 2012.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -615,7 +615,7 @@ function! s:indent_snippet(begin, end)"{{{
       if &l:expandtab
         " Expand tab.
         cal setline('.', substitute(getline('.'),
-              \ '^\t\+', repeat(' ', &shiftwidth *
+              \ '^\t\+', base_indent . repeat(' ', &shiftwidth *
               \    len(matchstr(getline('.'), '^\t\+'))), ''))
       elseif line_nr != a:begin
         call setline('.', base_indent . getline('.'))
diff --git a/doc/neocomplcache-snippets-complete.txt b/doc/neocomplcache-snippets-complete.txt
index 26df647..890bdea 100644
--- a/doc/neocomplcache-snippets-complete.txt
+++ b/doc/neocomplcache-snippets-complete.txt
@@ -295,6 +295,9 @@ snippet						*neocomplcache-snippets-complete-unite-action-snippet*
 ==============================================================================
 CHANGELOG					*neocomplcache-snippets-complete-changelog*
 
+2012-03-18
+- Fixed for expandtab.
+
 2012-03-17
 - Fixed for echodoc.