diff --git a/00readme b/00readme
index 2d184f0..93af4cf 100644
--- a/00readme
+++ b/00readme
@@ -1,14 +1,8 @@
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-・1997年3月10日、「雷鳥」の作者であり、「野鳥」の成長に大きな貢献をして
-  下さった桂川直己さんが交通事故によりお亡くなりになりました。野鳥ファミ
-  リーはかけがえの無い大きな存在を失ってしまいました。もしよろしければ、
-  彼のゲストブックに感謝と追悼の気持ちを残して下さいませんか。
-  http://www.comp.ae.keio.ac.jp/~lune/
-  から「guest book」というリンクをたどって下さい。
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ・「野鳥」およびその Vz への移植版である「雷鳥」、Wzへの移植版である「白
   鳥」に関する情報交換のためのメイリングリスト「fj野鳥の会」に是非御参加
-  ください。詳しくは docs/qanda ファイルを御覧ください。
+  ください。詳しくは docs/qanda ファイル、または
+  http://www.comp.ae.keio.ac.jp/~yuuji/yatex/
+  を御覧ください。
 
 ・makefile の先頭部分を編集し、
 	mule2(emacs-19) を使う場合は make install
diff --git a/makefile b/makefile
index 6b4c159..99cd7f5 100644
--- a/makefile
+++ b/makefile
@@ -2,56 +2,158 @@
 # Makefile for YaTeX.
 #
 
-MVER	= 1.50
-LISP	= comment.el yatex.el yatexadd.el yatexgen.el yatexenv.el yatexlib.el \
-	  yatexmth.el yatexhks.el yatexhlp.el yatexprc.el \
-	  yatexm-o.el yatexsec.el
-#	\  yahatml.el 
-DOCS	= $(DOCSRC) $(DOCOBJ)
-DOCSRC	= yatex.new docs/yatexj.tex docs/yatexe.tex \
-	  docs/yatex.ref docs/yatexadd.doc docs/yatexgen.doc docs/qanda
-DOCOBJ	= docs/yatexj docs/yatexe
-HELP	= help/YATEXHLP.jp
-MANIFEST= manifest
-EXTRA	= dir install 00readme
-DISTRIB = $(EXTRA) $(LISP) $(DOCS) $(MANIFEST) $(HELP)
-RCSFILE	= $(LISP) $(DOCSRC) $(HELP)
-PACK	= `echo $(DISTRIB)|xargs ls`
+# Edit these variables to be suitable for your site
+LIBDIR	= /usr/local/lib
+
+EMACSDIR= ${LIBDIR}/mule
+LISPDIR	= ${EMACSDIR}/site-lisp/yatex
+DOCDIR	= ${LISPDIR}/docs
+HELPDIR	= ${EMACSDIR}/site-lisp
+INFODIR	= ${EMACSDIR}/info
+EMACS	= mule
+
 TAR	= gtar
+INSTALL	= install -c -m 444
+
+###################
+# Do not edit below
+###################
+# make install		to install YaTeX into public space
+# make install-nw	same as above, but -nw mode, or Emacs18(Nemacs)
+# make ajimi		to feel taste
+# make ajimi-nw		same as above, but -nw mode
+# make package		to create package for relase
+# make yahtmlpack	to create package for relase
+# make clean		to delete all producted files
+# make ci		to check in all
+# make co		to for check out all
+MVER	= 1.61
+LISP	= ${LISP18} ${LISP19}
+YAHTML	= yahtml.el
+COMMON	= yatexlib.el yatexprc.el
+LISP18	= comment.el yatex.el yatexadd.el yatexgen.el yatexenv.el \
+	  ${COMMON} \
+	  yatexmth.el yatexhks.el yatexhlp.el \
+	  yatexm-o.el yatexsec.el  yatexhie.el ${YAHTML}
+LISP19	= yatex19.el
+DOCS	= ${DOCSRC} ${DOCOBJ} ${NEWS}
+NEWS	= yatex.new
+DOCHTML	= docs/htmlqa
+DOCSRC	= docs/yatexj.tex docs/yatexe.tex \
+	  docs/yatex.ref docs/yatexref.eng \
+	  docs/yatexadd.doc docs/yatexgen.doc \
+	  docs/qanda docs/qanda.eng ${DOCHTML}
+DOCOBJ	= docs/yatexj docs/yatexe
+HELP	= help/YATEXHLP.jp help/YATEXHLP.eng
+MANIFEST= manifest
+EXTRA	= dir install 00readme makefile
+DISTRIB = ${EXTRA} ${LISP} ${DOCS} ${MANIFEST} ${HELP}
+RCSFILE	= ${LISP} ${NEWS} ${DOCSRC} ${HELP}
+YAHTMLLISP = ${YAHTML} ${COMMON}
+YAHTMLDIST = ${YAHTMLLISP} install 00readme makefile
+PACK	= `echo ${DISTRIB}|xargs ls`
 TMPDIR	= /tmp
 VERSION = `head yatex.el|awk '/rev\./{print $$4}'`
-PACKDIR	= $(TMPDIR)/yatex$(VERSION)
-EMACS	= mule
-INSTALL	= install -c
+PACKDIR	= ${TMPDIR}/yatex${VERSION}
 
 all:
+	@echo "Edit this makefile first."
+	@echo 'Type "make install" to install YaTeX.'
+	@echo 'Type "make install-yahtml" to install yahtml.'
+	@echo "If you don't use X-clinet of Emacs,"
+	@echo 'type "make install-nw" instead.'
 
-install:
-	$(EMACS) -batch -e batch-byte-compile $(LISP)
-	#$(INSTALL) * $(MYELISPLIB)
+install: bytecompile install-real
+install-yahtml: bytecompile-yahtml
+	if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi
+	${INSTALL} *.elc ${LISPDIR}
 
-package:
-	@-mkdir $(PACKDIR)
-	@tar cf - $(PACK) | (cd $(PACKDIR); tar xf -)
-	find $(PACKDIR) -type f -exec chmod -x '{}' \;
-	( version=$(VERSION); cd $(TMPDIR); \
-	     $(TAR) vzcf $(TMPDIR)/yatex$$version.tar.gz yatex$$version)
+install-real:
+	if [ ! -d ${LISPDIR} ]; then mkdir ${LISPDIR}; fi
+	if [ ! -d ${DOCDIR} ]; then mkdir ${DOCDIR}; fi
+	${INSTALL} *.elc ${NEWS} ${LISPDIR}
+	${INSTALL} ${DOCSRC} ${DOCDIR}
+	${INSTALL} ${DOCOBJ} ${INFODIR}
+	${INSTALL} ${HELP} ${HELPDIR}
+	@echo "Add next two lines into your site's info dir manually please!"
+	@cat dir
+
+install-nw: bytecompile-nw install-real
+
+bytecompile: lp
+	if [ "$$DISPLAY"x = ""x ]; then \
+		echo "Set DISPLAY environment variable!!"; exit 1; fi
+	${EMACS} -q -geometry 80x20+0+0 -l ./lp.el -e bcf-and-exit ${LISP}
+
+bytecompile-nw: lp lp1
+	${EMACS} -batch -l ./lp.el -e batch-byte-compile ${LISP18}
+
+bytecompile-yahtml: lp
+	if [ "$$DISPLAY"x = ""x ]; then \
+		echo "Set DISPLAY environment variable!!"; exit 1; fi
+	${EMACS} -q -g 80x20+0+0 -l ./lp.el -e bcf-and-exit ${YAHTMLLISP}
+
+lp:
+	echo '(setq load-path (cons "." load-path))'	> lp.el
+	echo '(load-file "./yatexlib.el")'		>>lp.el
+
+lp1:
+	echo '(load-file "./yatex.el")'			>>lp.el
+	echo '(load-file "./comment.el")'		>>lp.el
+
+lp2:
+	echo '(setq load-path (cons "'`pwd`'" load-path))'		>>lp.el
+	echo '(setq auto-mode-alist'					>>lp.el
+	echo '(cons (cons "\\.tex" '"'yatex-mode) auto-mode-alist))"	>>lp.el
+	echo '(load-library "yatex")'					>>lp.el
+
+ajimi: lp lp2
+	${EMACS} -l ./lp.el -e yatex-mode
+
+ajimi-nw: lp lp2
+	${EMACS} -nw -l ./lp.el -e yatex-mode
+
+clean:
+	rm -f *.elc *~ lp.el
+
+info: docs/yatexj docs/yatexe
+
+docs/yatexj: docs/yatexj.tex
+	(cd docs; ${EMACS} -batch yatexj.tex -e texinfo-format-buffer \
+	 -e basic-save-buffer)
+
+docs/yatexe: docs/yatexe.tex
+	(cd docs; ${EMACS} -batch yatexe.tex -e texinfo-format-buffer \
+	 -e basic-save-buffer)
+
+package: info
+	@-mkdir ${PACKDIR}
+	@tar cf - ${PACK} | (cd ${PACKDIR}; tar xf -)
+	find ${PACKDIR} -type f -exec chmod -x '{}' \;
+	( version=${VERSION}; cd ${TMPDIR}; \
+	     ${TAR} vzcf ${TMPDIR}/yatex$$version.tar.gz yatex$$version)
+
+yahtmlpack:
+	@-mkdir ${PACKDIR}
+	@tar cf - ${YAHTMLDIST} | (cd ${PACKDIR}; tar xf -)
+	( version=${VERSION}; cd ${TMPDIR}; \
+	     ${TAR} vzcf ${TMPDIR}/yahtml$$version.tar.gz yatex$$version)
 
 ci:
-	ci -r$(VERSION) -sRel -f $(RCSFILE)
-	ci -u$(VERSION) makefile
+	ci -r${VERSION} -sRel -f ${RCSFILE}
+	ci -u${VERSION} makefile 00readme
 
 co:
-	co $(RCSFILE)
+	co ${RCSFILE}
 
 co-l:
-	co -l $(RCSFILE)
+	co -l ${RCSFILE}
 
 tci:
-	ci -l$(VERSION).0 -Ncurrent $(RCSFILE) makefile
+	ci -l${VERSION}.0 -Ncurrent ${RCSFILE} makefile
 
 dostci:
-	ci -l$(MVER).0 -Ncurrent @rcsfile
+	ci -l${MVER}.0 -Ncurrent @rcsfile
 
 gohome:
 	zip -u -r /com/okoma/yuuji/tmp/dosconv/yatex.zip . \