diff --git a/.gitattributes b/.gitattributes
index 3ae06b64c14c61fccc7eb43cacd0d6a3417414a7..7052b22c76ea5a45b868e1bc0f22cb69ea7fc577 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -738,3 +738,4 @@ testfont binary
 /src/treeopt.in foreign_ident
 /src/version.c foreign_ident
 /src/version.h foreign_ident
+/tools/pike.el foreign_ident
diff --git a/man/pike.1 b/man/pike.1
index e859d174060dc96847ad2f5a8712d1f449ad9848..11bcc762ef4f947f99af79288765ead41ce05b48 100644
--- a/man/pike.1
+++ b/man/pike.1
@@ -1,11 +1,11 @@
-.\" $Id: pike.1,v 1.13 2001/03/11 15:52:29 grubba Exp $
+.\" $Id: pike.1,v 1.14 2002/08/02 05:07:15 jhs Exp $
 .\" name section last-modified title section-name product/status architecture
 .ds ]L Pike
-.TH pike 1 "$Date: 2001/03/11 15:52:29 $" Pike "Pike Manual" Pike
-.\" On Solaris ]L will contain "Last modified $Date: 2001/03/11 15:52:29 $"
+.TH pike 1 "$Date: 2002/08/02 05:07:15 $" Pike "Pike Manual" Pike
+.\" On Solaris ]L will contain "Last modified $Date: 2002/08/02 05:07:15 $"
 .\" while HPUX uses ]L to contain "Pike".
 .\" On OSF/1 ]L will already contain the wanted string.
-.if !\*(]LPike .ds ]L $Date: 2001/03/11 15:52:29 $ \" Solaris nroff
+.if !\*(]LPike .ds ]L $Date: 2002/08/02 05:07:15 $ \" Solaris nroff
 .\" Major (mj) and minor (mn) version of Pike
 .nr mj 7
 .nr mn 3
@@ -285,7 +285,7 @@ backward compatibility modules
 .B \*(bd/lib/include/*
 pike include files
 .TP
-.B \*(bd/lib/tools/pike.el
+.B \*(bd/tools/pike.el
 emacs fontlock definitions for pike-mode
 .TP
 .B \*(bd/include/pike/*
diff --git a/lib/tools/pike.el b/tools/pike.el
similarity index 99%
rename from lib/tools/pike.el
rename to tools/pike.el
index 2780d4ce4e25612919a6384ba29f2a2cee05a26e..358b3ae5b5ecd9f8156d9cd8c22529c05668b4a2 100644
--- a/lib/tools/pike.el
+++ b/tools/pike.el
@@ -1,5 +1,5 @@
 ;;; pike.el -- Font lock definitions for Pike and other LPC files.
-;;; $Id: pike.el,v 1.39 2002/05/11 21:42:25 mast Exp $
+;;; $Id: pike.el,v 1.39 2002/08/02 05:07:15 jhs fake $
 ;;; Copyright (C) 1995, 1996, 1997, 1998, 1999 Per Hedbor.
 ;;; This file is distributed as GPL