diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..c52b347
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = common unix
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..c893761
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,8 @@
+AC_PREREQ(2.61)
+AC_INIT([tightvnc], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
+
+AC_CONFIG_SUBDIRS([common
+                   unix])
+
+AC_OUTPUT([Makefile])
diff --git a/unix/Makefile.am b/unix/Makefile.am
index 59dbc22..246fbd7 100644
--- a/unix/Makefile.am
+++ b/unix/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@
+SUBDIRS = tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/unix/configure.ac b/unix/configure.ac
index 8c9d37d..c0c2adf 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -5,8 +5,6 @@
 
 AC_SUBST([COMMON_DIR], ['$(top_srcdir)/../common'])
 
-AC_CONFIG_SUBDIRS([../common])
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX