diff --git a/artnet/Makefile.am b/artnet/Makefile.am
index 5312757..6ffeebf 100644
--- a/artnet/Makefile.am
+++ b/artnet/Makefile.am
@@ -1,6 +1,10 @@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-AM_CFLAGS = -Wall -Werror -Wformat -W
+AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -Wall -Werror -Wformat -W
+
+EXTRA_DIST = tod.h misc.h
+
+pkginclude_HEADERS = artnet.h packets.h common.h
+pkgincludedir = $(includedir)/artnet
 
 lib_LTLIBRARIES = libartnet.la
 libartnet_la_SOURCES = artnet.c private.h misc.c network.c receive.c \
@@ -11,7 +15,3 @@ if USING_WIN32
 libartnet_la_LDFLAGS += -no-undefined -liphlpapi -lnetapi32 -lws2_32 -ldpnet
 endif
 
-EXTRA_DIST = tod.h misc.h
-
-pkginclude_HEADERS = artnet.h packets.h common.h
-pkgincludedir = $(includedir)/artnet
diff --git a/configure.ac b/configure.ac
index 78f6a3e..bd7d981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(configure.ac)
+AC_INIT(libartnet, [1.1.2])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE(libartnet, 1.1.1)
+AC_CONFIG_MACRO_DIR([config])
+AM_INIT_AUTOMAKE
 
 # Checks for programs.
 AC_PROG_CC