diff --git a/data/Makefile.am b/data/Makefile.am
index 45f2f4a..5ce339b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,4 @@
+NULL = 
 EXTRA_DIST = \
 	foo_fighter \
 	bar_fighter \
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ede6f3..2b4fbc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,8 @@
 # Automake targets and declarations for ttyvaders
 ###############################################################################
 
+AM_CPPFLAGS = -I../libee
+
 if USE_SLANG
 LDFLAGS_slang = -lslang
 endif
@@ -26,7 +28,5 @@ ttyvaders_SOURCES = \
 	tunnel.c \
 	weapons.c \
 	$(NULL)
-
-ttyvaders_CPPFLAGS = -I../libee
 ttyvaders_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses)
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 1dfa5df..8d8bb0b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,6 +2,8 @@
 # Automake targets and declarations for libee tests
 ###############################################################################
 
+AM_CPPFLAGS = -I../libee
+
 if USE_SLANG
 LDFLAGS_slang = -lslang
 endif
@@ -9,9 +11,11 @@ if USE_NCURSES
 LDFLAGS_ncurses = -lncurses
 endif
 
-bin_PROGRAMS = demo
-demo_SOURCES = demo.c
+bin_PROGRAMS = demo spritedit
 
-demo_CPPFLAGS = -I../libee
+demo_SOURCES = demo.c
 demo_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 
+spritedit_SOURCES = spritedit.c
+spritedit_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+
diff --git a/test/spritedit.c b/test/spritedit.c
new file mode 100644
index 0000000..e86f6f5
--- /dev/null
+++ b/test/spritedit.c
@@ -0,0 +1,58 @@
+/*
+ *   spritedit     sprite editor using libee
+ *   Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
+ *                 All Rights Reserved
+ *
+ *   $Id$
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "config.h"
+
+#include <math.h>
+#include <string.h>
+
+#include "ee.h"
+
+int main(int argc, char **argv)
+{
+    int quit = 0;
+
+    if(ee_init())
+    {
+        return 1;
+    }
+
+    /* Go ! */
+    while(!quit)
+    {
+        char key = ee_get_key();
+        switch(key)
+        {
+        case 0:
+            break;
+        case 'q':
+            quit = 1;
+            break;
+        }
+    }
+
+    /* Clean up */
+    ee_end();
+
+    return 0;
+}
+