diff --git a/.gitignore b/.gitignore
index c046297..d5db3c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,21 @@
 *.o
 *.a
-libtelnet-dist.tar.gz
+*.la
+*.lo
+config.*
+ltmain.sh
+aclocal.m4
+Makefile.in
+Makefile
+configure
+libtelnet-*.tar.gz
+libtool
+missing
+depcomp
+install-sh
+autom4te.cache
+.deps
+.libs
 telnet-proxy
 telnet-client
 telnet-chatd
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d5d21ff
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+Public Domain
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..519352b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+See git log.
diff --git a/INSTALL b/INSTALL
new file mode 120000
index 0000000..cbd1c80
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+/usr/share/automake-1.11/INSTALL
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4222fc8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-VERSION = 0.9
-CFLAGS = -Wall -g -O0 -DHAVE_ZLIB -DHAVE_ALLOCA -DENABLE_COLOR
-LFLAGS = -L. -ltelnet -lz
-
-all: telnet-proxy telnet-client telnet-chatd
-
-%.o: %.c libtelnet.h
-	$(CC) -o $@ -c $(CFLAGS) $<
-
-libtelnet.a: libtelnet.o libtelnet.h
-	$(AR) rcs $@ $< 
-
-telnet-proxy: telnet-proxy.o libtelnet.a Makefile
-	$(CC) -o $@ $< $(LFLAGS)
-
-telnet-client: telnet-client.o libtelnet.a Makefile
-	$(CC) -o $@ $(CFLAGS) $< $(LFLAGS)
-
-telnet-chatd: telnet-chatd.o libtelnet.a Makefile
-	$(CC) -o $@ $(CFLAGS) $< $(LFLAGS)
-
-clean:
-	rm -f libtelnet.a libtelnet.o telnet-proxy telnet-proxy.o \
-		telnet-client telnet-client.o telnet-chatd telnet-chatd.o
-
-dist:
-	rm -fr libtelnet-$(VERSION)
-	rm -f libtelnet-$(VERSION).tar.gz
-	mkdir libtelnet-$(VERSION)
-	cp Makefile README libtelnet.h libtelnet.c telnet-proxy.c \
-		telnet-client.c telnet-chatd.c libtelnet-$(VERSION)
-	tar -cf libtelnet-$(VERSION).tar libtelnet-$(VERSION)
-	gzip libtelnet-$(VERSION).tar
-	rm -fr libtelnet-$(VERSION)
-
-.PHONY: all clean dist
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..b4fcf84
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES = libtelnet.la
+libtelnet_la_SOURCES = libtelnet.c libtelnet.h
+
+bin_PROGRAMS = telnet-client telnet-chatd telnet-proxy
+
+telnet_client_SOURCES = telnet-client.c telnet-client.h
+telnet_client_LDADD = libtelnet.la
+
+telnet_chatd_SOURCES = telnet-chatd.c telnet-chatd.h
+telnet_chatd_LDADD = libtelnet.la
+
+telnet_proxy_SOURCES = telnet-proxy.c telnet-proxy.h
+telnet_proxy_LDADD = libtelnet.la
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..a6786ff
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,4 @@
+Version 0.10
+============
+
+* use automake/autoconf/libtool for building
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..ea3c09c
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([libtelnet], [0.9], [http://github.com/elanthis/libtelnet/tree/master])
+
+AM_INIT_AUTOMAKE
+
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT