diff --git a/configure.in b/configure.in
index 0a6116b..6aaac61 100644
--- a/configure.in
+++ b/configure.in
@@ -21,12 +21,10 @@ AC_FUNC_REALLOC
 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
-AC_PROG_LEX
-#AC_DECL_YYTEXT
+AM_PROG_LEX
                   
 VERSION="0.0.1"
-AC_SUBST(ac_aux_dir)
-SUBDIRS = src 
+SUBDIRS=src 
 
 dnl read Makefile.in and write Makefile
 AC_OUTPUT(Makefile src/Makefile)
diff --git a/src/main.c b/src/main.c
index ff9bac7..dd344a7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@
 #include "symbols.h"
 #include "pheading.h"
 #include "symbols.h"
-#include "parser.tab.h"
+#include "y.tab.h"
 #include "tac.h"
 #include "compiler.h"
 #include "latex.h"
diff --git a/src/scanner.lex b/src/scanner.l
similarity index 99%
rename from src/scanner.lex
rename to src/scanner.l
index 96a541e..e50f081 100644
--- a/src/scanner.lex
+++ b/src/scanner.l
@@ -9,7 +9,7 @@
 #include "tac.h"
 
 /* tokens for language */
-#include "tok.h"
+#include "y.tab.h"
 
 void mkname(char *name);
 void mkval(void);