diff --git a/src/Makefile.am b/src/Makefile.am
index 914688e..d2636d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ scyther_SOURCES = main.c \
 		 output.c latex.c varbuf.c tracebuf.c \
 		 attackminimize.c tac.c \
 		 compiler.c \
-		 scanner.lex parser.y
+		 scanner.l parser.y
 scyther_LDADD = @LEXLIB@
 
 
diff --git a/src/bootstrap b/src/bootstrap
new file mode 100755
index 0000000..3cb1458
--- /dev/null
+++ b/src/bootstrap
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+aclocal \
+&& automake --gnu --add-missing \
+&& autoconf
+
diff --git a/src/configure.in b/src/configure.in
index ad2a994..50dd918 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -9,7 +9,7 @@ AC_PROG_MAKE_SET
                
 AC_HEADER_STDC
 AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?))
-AC_CHECK_LIB(argtable2, arg_parse,,AC_MSG_ERROR(Scyther requires the argtable2 package. Get it from http://argtable.sourceforge.net/))
+AC_CHECK_LIB(argtable2, arg_parse,,AC_MSG_ERROR(Scyther requires the argtable2 package (LGPL). Get it from http://argtable.sourceforge.net/))
 AC_PROG_YACC
 AM_PROG_LEX
                   
diff --git a/src/main.c b/src/main.c
index c352ed4..d514176 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@
 #include "symbols.h"
 #include "pheading.h"
 #include "symbols.h"
-#include "tok.h"
+#include "parser.h"
 #include "tac.h"
 #include "compiler.h"
 #include "latex.h"