diff --git a/magit.el b/magit.el
index a7a5ea4b..f6051635 100644
--- a/magit.el
+++ b/magit.el
@@ -29,7 +29,7 @@
 ;; current HEAD.  You can add individual hunks from the working tree
 ;; to the index, and you can commit the index.
 ;;
-;; See the Magit User Guide for more information.
+;; See the Magit User Manual for more information.
 
 ;;; TODO
 
diff --git a/magit.texi b/magit.texi
new file mode 100644
index 00000000..93b0ff13
--- /dev/null
+++ b/magit.texi
@@ -0,0 +1,55 @@
+\input texinfo.tex    @c -*-texinfo-*-
+@c %**start of header
+@setfilename magit.info
+@settitle Magit User Manual
+@c %**end of header
+
+@dircategory Emacs
+@direntry
+* Magit: (magit).        Using git from Emacs with Magit.
+@end direntry
+
+@setchapternewpage off
+
+@c Put everything in one index (arbitrarily chosen to be the concept index).
+@syncodeindex fn cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex vr cp
+
+@copying
+Copyright @copyright{} 2008 Marius Vollmer
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+@end quotation
+@end copying
+
+@titlepage
+@title Magit User Manual
+@author Marius Vollmer
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@contents
+
+@ifnottex
+@node Top
+@top Version
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Introduction::                
+@end menu
+
+@node Introduction
+@chapter Introduction