diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index 9914bed..a764b22 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,27 +1,13 @@
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2003 Apr 06
+" Last Change: 2010 Jul 11
+"
+" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim
 
-" Don't do this when:
-" - when 'compatible' is set
-" - this plugin was already loaded
-" - user commands are not available.
+" Define the :TOhtml command when:
+" - 'compatible' is not set
+" - this plugin was not already loaded
+" - user commands are available.
 if !&cp && !exists(":TOhtml") && has("user_commands")
-  command -range=% TOhtml :call Convert2HTML(<line1>, <line2>)
-
-  func Convert2HTML(line1, line2)
-    if a:line2 >= a:line1
-      let g:html_start_line = a:line1
-      let g:html_end_line = a:line2
-    else
-      let g:html_start_line = a:line2
-      let g:html_end_line = a:line1
-    endif
-
-    runtime syntax/2html.vim
-
-    unlet g:html_start_line
-    unlet g:html_end_line
-  endfunc
-
+  command -range=% TOhtml :call tohtml#Convert2HTML(<line1>, <line2>)
 endif