diff --git a/configure.in b/configure.ac
similarity index 95%
rename from configure.in
rename to configure.ac
index 0f90e56..1dc158b 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,5 +1,6 @@
-AC_INIT(usrsctplib/netinet/sctp.h)
-AM_INIT_AUTOMAKE(libusrsctp, 0.1)
+AC_INIT([libusrsctp], [0.1])
+AC_CONFIG_SRCDIR([usrsctplib/netinet/sctp.h])
+AM_INIT_AUTOMAKE
 
 AC_PROG_CC
 AC_PROG_LIBTOOL
diff --git a/programs/Makefile.am b/programs/Makefile.am
index 76deb9b..fdefe4e 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -6,5 +6,5 @@ discard_server_SOURCES = discard_server.c
 discard_server_LDADD = ../usrsctplib/libusrsctp.la
 client_SOURCES = client.c
 client_LDADD = ../usrsctplib/libusrsctp.la
-INCLUDES = -I$(srcdir)/../usrsctplib
+AM_CPPFLAGS = -I$(srcdir)/../usrsctplib