diff --git a/doc/Section_tools.html b/doc/Section_tools.html
index e48547c76d..c1421896a3 100644
--- a/doc/Section_tools.html
+++ b/doc/Section_tools.html
@@ -52,6 +52,7 @@ own sub-directories with their own Makefiles.
 <LI><A HREF = "#eamdb">eam database</A>
 <LI><A HREF = "#eamgn">eam generate</A>
 <LI>"eff_#eff
+<LI>"emacs_#emacs
 <LI>"ipp_#ipp
 <LI><A HREF = "#arc">lmp2arc</A>
 <LI><A HREF = "#cfg">lmp2cfg</A>
@@ -197,6 +198,17 @@ electron force field (eFF).
 </P>
 <HR>
 
+<H4><A NAME = "emacs"></A>emacs tool 
+</H4>
+<P>The tools/emacs directory contains a Lips add-on file for Emacs that
+enables a lammps-mode for editing of input scripts when using Emacs,
+with various highlighting options setup.
+</P>
+<P>These tools were provided by Aidan Thompson at Sandia
+(athomps at sandia.gov).
+</P>
+<HR>
+
 <H4><A NAME = "ipp"></A>ipp tool 
 </H4>
 <P>The tools/ipp directory contains a Perl script ipp which can be used
diff --git a/doc/Section_tools.txt b/doc/Section_tools.txt
index f57f8f7d32..c732bb0af0 100644
--- a/doc/Section_tools.txt
+++ b/doc/Section_tools.txt
@@ -48,6 +48,7 @@ own sub-directories with their own Makefiles.
 "eam database"_#eamdb
 "eam generate"_#eamgn
 "eff_#eff
+"emacs_#emacs
 "ipp_#ipp
 "lmp2arc"_#arc
 "lmp2cfg"_#cfg
@@ -193,6 +194,17 @@ These tools were provided by Andres Jaramillo-Botero at CalTech
 
 :line
 
+emacs tool :h4,link(emacs)
+
+The tools/emacs directory contains a Lips add-on file for Emacs that
+enables a lammps-mode for editing of input scripts when using Emacs,
+with various highlighting options setup.
+
+These tools were provided by Aidan Thompson at Sandia
+(athomps at sandia.gov).
+
+:line
+
 ipp tool :h4,link(ipp)
 
 The tools/ipp directory contains a Perl script ipp which can be used