diff --git a/ChangeLog b/ChangeLog
index 01adaf7c2b..2497d66ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-04-27  Matt Loper  <matt@helixcode.com>
+
+	* configure.in: added tools/Makefile.
+
+	* Makefile.am: Added tools.
+
+	* tools/: New directory for tools relating to evolution.
+
+	* tools/killev: New script for killing all evolution-related
+	stuff.
+
+        * tools/Makefile.am: New file.
+	
+	* tools/.cvsignore: New file.
+
 2000-04-26  NotZed  <NotZed@HelixCode.com>
 
 	* tests/test13.c (main): And here too.
diff --git a/Makefile.am b/Makefile.am
index 84a282bb0f..62ebf01a4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ SUBDIRS =			\
 	wombat			\
 	art			\
 	default_user		\
+	tools			\
 	po
 
 dist-hook:
diff --git a/configure.in b/configure.in
index b799033291..cdc5cf7a46 100644
--- a/configure.in
+++ b/configure.in
@@ -376,4 +376,5 @@ filter/Makefile
 wombat/Makefile
 art/Makefile
 default_user/Makefile
+tools/Makefile
 ])
diff --git a/tools/.cvsignore b/tools/.cvsignore
new file mode 100644
index 0000000000..36a2ee1e24
--- /dev/null
+++ b/tools/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps
\ No newline at end of file
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000000..bca2f2c87c
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1 @@
+bin_SCRIPTS = killev
\ No newline at end of file
diff --git a/tools/killev b/tools/killev
new file mode 100755
index 0000000000..4770f8a4bf
--- /dev/null
+++ b/tools/killev
@@ -0,0 +1,11 @@
+killall -9 wombat 2>/dev/null
+killall -9 lt-wombat 2>/dev/null
+killall -9 tlacuache 2>/dev/null
+killall -9 evolution-addressbook 2>/dev/null
+killall -9 lt-evolution-addressbook 2>/dev/null
+killall -9 evolution-calendar 2>/dev/null
+killall -9 lt-evolution-calendar 2>/dev/null
+killall -9 lt-gnomecal 2>/dev/null
+killall -9 evolution-mail 2>/dev/null
+killall -9 lt-evolution-mail 2>/dev/null
+killall -9 evolution 2>/dev/null