diff --git a/.gitignore b/.gitignore
index 0165d6f..0c064fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,12 @@ Makefile
 configure
 config.*
 
-# should be added using automake --add-missing
+# should be added using autoreconf -i
 INSTALL
 tools/install-sh
 tools/missing
+tools/mdate-sh
+tools/texinfo.tex
 
 # downloaded manually by user
 tools/closure-compiler.jar
diff --git a/doc/.gitignore b/doc/.gitignore
index 926e2a6..8991c2e 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -12,3 +12,5 @@
 *.toc
 
 version.texi
+easejs.info
+stamp-vti
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e804f1d..b374175 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,3 @@
-##
 # ease.js manual Makefile
 #
 # Responsible for building the project documentation.
@@ -21,12 +20,13 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-info_TEXINFOS = manual.texi
-manual_TEXINFOS = license.texi about.texi classes.texi				\
+info_TEXINFOS = easejs.texi
+easejs_TEXINFOS = license.texi about.texi classes.texi              \
 impl-details.texi integration.texi mkeywords.texi source-tree.texi
-EXTRA_DIST = README highlight.pack.js interactive.js manual.css		\
-img/composition-uml.dia img/composition-uml.txt inheritance-ex.dia	\
-inheritance-ex.txt visobj-collection-wide.dia						\
+
+EXTRA_DIST = README highlight.pack.js interactive.js easejs.css     \
+img/composition-uml.dia img/composition-uml.txt inheritance-ex.dia  \
+inheritance-ex.txt visobj-collection-wide.dia                       \
 visobj-collection-wide.txt visobj.dia visobj.txt
 
 path_doc=.
@@ -34,13 +34,13 @@ path_build=../build
 path_lib=../lib
 docdir = @docdir@
 path_doc_output=${path_build}/doc
-path_doc_output_plain=${path_doc_output}/manual.txt
-path_doc_output_html=${path_doc_output}/manual
-path_doc_output_html1=${path_doc_output}/manual.html
-path_doc_css=${path_doc}/manual.css
+path_doc_output_plain=${path_doc_output}/easejs.txt
+path_doc_output_html=${path_doc_output}/easejs
+path_doc_output_html1=${path_doc_output}/easejs.html
+path_doc_css=${path_doc}/easejs.css
 path_doc_img=${path_doc}/img
-path_doc_css_ref=manual.css
-path_manual_texi=${path_doc}/manual.texi
+path_doc_css_ref=easejs.css
+path_easejs_texi=${path_doc}/easejs.texi
 
 doc_src := $(wildcard $(path_doc)/*.texi)
 doc_imgs := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.dia))
@@ -74,15 +74,15 @@ $(path_doc)/img/%.png: $(path_doc)/img/%.dia
 # doc pdf
 $(path_doc_output)/%.pdf: $(doc_src) $(doc_imgs) | mkbuild-doc img
 	TEXINPUTS="$(path_doc):" \
-		pdftex -output-directory "${path_doc}" "${path_manual_texi}" && \
+		pdftex -output-directory "${path_doc}" "${path_easejs_texi}" && \
 		TEXINPUTS="$(path_doc):" \
-		pdftex -output-directory "${path_doc}" "${path_manual_texi}"
+		pdftex -output-directory "${path_doc}" "${path_easejs_texi}"
 	mv -f "${path_doc}"/*.pdf "${path_doc_output}"
 	cd "$(path_doc)" && rm -f $(shell cat "$(path_doc)/.gitignore")
 
 # doc plain text
 $(path_doc_output_plain): $(doc_imgs_txt) | mkbuild-doc
-	makeinfo --plain -I "$(path_doc)" "${path_manual_texi}" > $@
+	makeinfo --plain -I "$(path_doc)" "${path_easejs_texi}" > $@
 
 # doc html (multiple pages)
 $(path_doc_output_html)/index.html: $(doc_src) $(path_doc_css) \
@@ -90,7 +90,7 @@ $(path_doc_output_html)/index.html: $(doc_src) $(path_doc_css) \
 $(path_doc_output_html)/highlight.pack.js \
 $(path_doc_output_html)/$(path_doc_css_ref) mkbuild-doc img
 	makeinfo --html --css-ref="$(path_doc_css_ref)" \
-		-I "$(path_doc)" -o "${path_doc_output_html}" "${path_manual_texi}"
+		-I "$(path_doc)" -o "${path_doc_output_html}" "${path_easejs_texi}"
 	sed -i '$(doc_replace)' $(path_doc_output_html)/*.htm?
 
 # doc html (single page)
@@ -98,7 +98,7 @@ $(path_doc_output_html1): $(doc_src) $(path_doc_css) \
 | $(path_doc_output)/img $(path_doc_output)/interactive.js \
 $(path_doc_output)/highlight.pack.js mkbuild-doc img
 	makeinfo --no-split --html --css-include="${path_doc_css}" \
-		-I "$(path_doc)" -o - "${path_manual_texi}" \
+		-I "$(path_doc)" -o - "${path_easejs_texi}" \
 		| sed '$(doc_replace)' \
 			> "$(path_doc_output_html1)"
 
@@ -122,21 +122,21 @@ $(path_doc_output_html)/%.css: $(path_doc)/%.css
 
 
 img: $(doc_imgs)
-pdf: $(path_doc_output)/manual.pdf
+pdf: $(path_doc_output)/easejs.pdf
 install-pdf: pdf
 	install -d $(DESTDIR)$(docdir)
-	install -m644 $(path_doc_output)/manual.pdf $(DESTDIR)$(docdir)/manual.pdf
+	install -m644 $(path_doc_output)/easejs.pdf $(DESTDIR)$(docdir)/easejs.pdf
 
 plain: $(path_doc_output_plain)
 install-plain: plain
 	install -d $(DESTDIR)$(docdir)
-	install -m644 $(path_doc_output_plain) $(DESTDIR)$(docdir)/manual.txt
+	install -m644 $(path_doc_output_plain) $(DESTDIR)$(docdir)/easejs.txt
 
 html: $(path_doc_output_html)/index.html $(path_doc_output_html1)
 install-html: html
-	install -d $(DESTDIR)$(docdir)/manual
-	install -m644 $(path_doc_output_html)/index.html $(DESTDIR)$(docdir)/manual/index.html
-	install -m644 $(path_doc_output_html1) $(DESTDIR)$(docdir)/manual.html
+	install -d $(DESTDIR)$(docdir)/easejs
+	install -m644 $(path_doc_output_html)/index.html $(DESTDIR)$(docdir)/easejs/index.html
+	install -m644 $(path_doc_output_html1) $(DESTDIR)$(docdir)/easejs.html
 
 clean:
 	rm -rf $(path_doc_output)
diff --git a/doc/manual.css b/doc/easejs.css
similarity index 100%
rename from doc/manual.css
rename to doc/easejs.css
diff --git a/doc/manual.texi b/doc/easejs.texi
similarity index 100%
rename from doc/manual.texi
rename to doc/easejs.texi