diff --git a/Makefile b/Makefile
deleted file mode 100644
index f076935..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-CC = gcc
-CFLAGS = -Wall -Wextra -O2
-
-all: console-server console-client
-
-console-server: console-server.o util.o \
-		log-handler.o socket-handler.o
-
-console-client: console-client.o util.o
-
-clean:
-	rm -f console-server console-client *.o
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..490e783
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS = foreign
+
+sbin_PROGRAMS = console-server
+bin_PROGRAMS = console-client
+
+AM_CFLAGS = -Wall -Wextra -Werror
+
+console_server_SOURCES = \
+	 console-server.c \
+	 console-server.h \
+	 util.c \
+	 log-handler.c \
+	 socket-handler.c
+
+console_client_SOURCES = \
+	 console-client.c \
+	 console-server.h \
+	 util.c
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..c11fa03
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,11 @@
+# initialisation
+AC_INIT([openbmc-console], 0.1, [Jeremy Kerr <jk@ozlabs.org>])
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+
+# required tools
+AC_PROG_CC
+
+# output
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT