diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 6dbd260..18d9f13 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -797,14 +797,18 @@ function! s:close_tag_table(table, ldest, header_ids) abort
       endif
     endfor
     if head > 0
+      call add(ldest, '<thead>')
       for row in table[1 : head-1]
         if !empty(filter(row, '!empty(v:val)'))
           call s:close_tag_row(row, 1, ldest, a:header_ids)
         endif
       endfor
+      call add(ldest, '</thead>')
+      call add(ldest, '<tbody>')
       for row in table[head+1 :]
         call s:close_tag_row(row, 0, ldest, a:header_ids)
       endfor
+      call add(ldest, '</tbody>')
     else
       for row in table[1 :]
         call s:close_tag_row(row, 0, ldest, a:header_ids)
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 4267d14..c3aaa38 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -3672,6 +3672,7 @@ Contributors and their Github usernames in roughly chronological order:
     - flex (@bratekarate)
     - Marius Lopez (@PtitCaius)
     - Edward Bassett (@ebassett)
+    - Gaurang Kher (@gaurangkher)
     - Rafael Castillo (@eltrufas)
     - Reiner Herrmann (@reinerh)
     - Ryan Winograd
@@ -3687,6 +3688,8 @@ http://code.google.com/p/vimwiki/issues/list. They may be accessible from
 https://github.com/vimwiki-backup/vimwiki/issues.
 
 New:~
+    * Issue #940: Render table header inside thead element and rest under
+      tbody element if table header specified in wiki
     * PR #811: Feature: Added handling of absolute path to vimwiki (with //)
     * PR #919: Fix duplicate helptag
     * PR #907: Cycle bullets