diff --git a/configure.ac b/configure.ac
index d8dc03e..e7df8d0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.57 2004/07/23 16:23:56 gdt Exp $
+## $Id: configure.ac,v 1.58 2004/07/26 19:27:51 paul Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -1125,7 +1125,7 @@
 	  vtysh/extract.pl
 	  redhat/Makefile redhat/quagga.spec
 	  lib/version.h
-dnl	  tests/Makefile
+	  tests/Makefile
 	  ,
 	  [chmod +x vtysh/extract.pl])
 
diff --git a/tests/.cvsignore b/tests/.cvsignore
index c2e9e1e..78f0e8b 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,2 +1,11 @@
-test-sig
+Makefile
+Makefile.in
+*.o
+tags
+TAGS
+.deps
 .nfs*
+*.lo
+*.la
+*.libs
+testsig
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..d8c73eb
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,9 @@
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
+
+noinst_PROGRAMS = testsig
+testsig_SOURCES = test-sig.c
+
+testsig_LDADD = ../lib/libzebra.la @LIBCAP@
+
+