diff --git a/libee/Makefile.am b/libee/Makefile.am
index 7329aa0..fb7e6e2 100644
--- a/libee/Makefile.am
+++ b/libee/Makefile.am
@@ -1,3 +1,12 @@
+###############################################################################
+# Automake targets and declarations for libee
+###############################################################################
+
+AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
+
+# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs
+
 if USE_SLANG
 CPPFLAGS_slang = -DUSE_SLANG
 endif
diff --git a/test/Makefile.am b/test/Makefile.am
index e69de29..85288bd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -0,0 +1,24 @@
+###############################################################################
+# Automake targets and declarations for libee tests
+###############################################################################
+
+AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
+
+# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs
+
+if USE_SLANG
+CPPFLAGS_slang = -DUSE_SLANG
+LDFLAGS_slang = -lslang
+endif
+if USE_NCURSES
+CPPFLAGS_ncurses = -DUSE_NCURSES
+LDFLAGS_ncurses = -lncurses
+endif
+
+bin_PROGRAMS = demo
+demo_SOURCES = demo.c
+
+demo_CPPFLAGS = -I../libee $(CPPFLAGS_slang) $(CPPFLAGS_ncurses)
+demo_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses)
+
diff --git a/test/demo.c b/test/demo.c
new file mode 100644
index 0000000..2db4afd
--- /dev/null
+++ b/test/demo.c
@@ -0,0 +1,54 @@
+/*
+ *   demo          demo 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 "ee.h"
+
+int main(int argc, char **argv)
+{
+    int quit = 0;
+
+    if(ee_init())
+    {
+        return 1;
+    }
+
+    /* Go ! */
+    while(!quit)
+    {
+        char key = ee_get_key();
+        if(key)
+        {
+            quit = 1;
+        }
+
+        ee_clear();
+        ee_goto(12,14);
+        ee_putchar('#');
+        ee_refresh();
+    }
+
+    /* Clean up */
+    ee_end();
+
+    return 0;
+}
+