diff --git a/unix/Makefile.am b/unix/Makefile.am
new file mode 100644
index 0000000..49d2e77
--- /dev/null
+++ b/unix/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd @VNCCONFIG_DIR@
diff --git a/unix/Makefile.in b/unix/Makefile.in
deleted file mode 100644
index 22b4acc..0000000
--- a/unix/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd @VNCCONFIG_DIR@
-
-# followed by boilerplate.mk
diff --git a/unix/configure.ac b/unix/configure.ac
index 8ead7bc..40bf10c 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -1,14 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
 AC_INIT([tightvnc], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
+
+AC_SUBST([COMMON_DIR], ['$(top_srcdir)/../common'])
 
 AC_CONFIG_SUBDIRS([../common])
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
 AC_LANG([C++])
 
 case "`(uname -sr) 2>/dev/null`" in
@@ -160,12 +162,12 @@
   fi
 fi
 
-AC_OUTPUT(Makefile:common.mk:Makefile.in:$BOILERPLATE \
-         tx/Makefile:common.mk:tx/Makefile.in:$BOILERPLATE \
-         x0vncserver/Makefile:common.mk:x0vncserver/Makefile.in:$BOILERPLATE \
-         vncviewer/Makefile:common.mk:vncviewer/Makefile.in:$BOILERPLATE \
-         vncconfig/Makefile:common.mk:vncconfig/Makefile.in:$BOILERPLATE \
-         vncpasswd/Makefile:common.mk:vncpasswd/Makefile.in:$BOILERPLATE \
-         intl/Makefile \
-         po/Makefile.in \
+AC_OUTPUT(Makefile
+         tx/Makefile
+         x0vncserver/Makefile
+         vncviewer/Makefile
+         vncconfig/Makefile
+         vncpasswd/Makefile
+         intl/Makefile
+         po/Makefile.in
 )
diff --git a/unix/tx/Makefile.am b/unix/tx/Makefile.am
new file mode 100644
index 0000000..2e15f15
--- /dev/null
+++ b/unix/tx/Makefile.am
@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES = libtx.la
+
+libtx_la_SOURCES = TXWindow.cxx TXScrollbar.cxx TXViewport.cxx TXImage.cxx \
+	TXMenu.cxx
+
+libtx_la_CPPFLAGS = -I$(COMMON_DIR) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
diff --git a/unix/tx/Makefile.in b/unix/tx/Makefile.in
deleted file mode 100644
index 92f4494..0000000
--- a/unix/tx/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SRCS = TXWindow.cxx TXScrollbar.cxx TXViewport.cxx TXImage.cxx TXMenu.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-DIR_CPPFLAGS = -I$(COMMON) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-library = libtx.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-	rm -f $(library)
-	$(AR) $(library) $(OBJS)
-	$(RANLIB) $(library)
-
-# followed by boilerplate.mk
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am
new file mode 100644
index 0000000..0ae7e25
--- /dev/null
+++ b/unix/vncconfig/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = vncconfig
+
+vncconfig_SOURCES = vncExt.c vncconfig.cxx QueryConnectDialog.cxx buildtime.c
+
+vncconfig_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+
+vncconfig_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
+	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+	@X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
diff --git a/unix/vncconfig/Makefile.in b/unix/vncconfig/Makefile.in
deleted file mode 100644
index 527a79e..0000000
--- a/unix/vncconfig/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-
-SRCS = vncExt.c vncconfig.cxx QueryConnectDialog.cxx
-
-OBJS = vncExt.o vncconfig.o QueryConnectDialog.o
-
-program = vncconfig
-
-DEP_LIBS = $(TOP)/tx/libtx.a $(COMMON)/rfb/librfb.a \
-	   $(COMMON)/network/libnetwork.a \
-           $(COMMON)/rdr/librdr.a
-
-EXTRA_LIBS = @X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
-
-DIR_CPPFLAGS = -I$(COMMON) -I$(TOP)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-all:: $(program)
-
-$(program): $(OBJS) buildtime.o $(DEP_LIBS)
-	rm -f $(program)
-	$(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) buildtime.o $(DEP_LIBS) $(LIBS) $(EXTRA_LIBS)
-
-buildtime.o: $(OBJS) $(DEP_LIBS)
-
-# followed by boilerplate.mk
diff --git a/unix/vncpasswd/Makefile.am b/unix/vncpasswd/Makefile.am
new file mode 100644
index 0000000..66fdf9d
--- /dev/null
+++ b/unix/vncpasswd/Makefile.am
@@ -0,0 +1,7 @@
+bin_PROGRAMS = vncpasswd
+
+vncpasswd_SOURCES = vncpasswd.cxx
+
+vncpasswd_CPPFLAGS = -I$(COMMON_DIR)
+
+vncpasswd_LDADD = $(COMMON_DIR)/rfb/librfb.la
diff --git a/unix/vncpasswd/Makefile.in b/unix/vncpasswd/Makefile.in
deleted file mode 100644
index a159b72..0000000
--- a/unix/vncpasswd/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SRCS = vncpasswd.cxx
-
-OBJS = vncpasswd.o
-
-program = vncpasswd
-
-DEP_LIBS = $(COMMON)/rfb/librfb.a
-
-DIR_CPPFLAGS = -I$(COMMON)
-
-all:: $(program)
-
-$(program): $(OBJS) $(DEP_LIBS)
-	rm -f $(program)
-	$(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(DEP_LIBS) $(LIBS)
-
-# followed by boilerplate.mk
diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
new file mode 100644
index 0000000..a5b9ac3
--- /dev/null
+++ b/unix/vncviewer/Makefile.am
@@ -0,0 +1,11 @@
+bin_PROGRAMS = vncviewer
+
+vncviewer_SOURCES = DesktopWindow.cxx CConn.cxx vncviewer.cxx buildtime.c
+
+vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
+	-I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+
+vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
+	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+	@X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ \
+	@DMEDIA_LIB@ # @LIBINTL@
diff --git a/unix/vncviewer/Makefile.in b/unix/vncviewer/Makefile.in
deleted file mode 100644
index e99720e..0000000
--- a/unix/vncviewer/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-prefix = @prefix@
-datadir = @datadir@
-localedir = $(datadir)/locale
-
-SRCS = DesktopWindow.cxx CConn.cxx vncviewer.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-program = vncviewer
-
-DEP_LIBS = $(TOP)/tx/libtx.a \
-           $(COMMON)/rfb/librfb.a \
-           $(COMMON)/network/libnetwork.a \
-           $(COMMON)/rdr/librdr.a
-
-EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 \
-  @X_EXTRA_LIBS@ @CL_LIB@ @DMEDIA_LIB@ @LIBINTL@
-
-DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-all:: $(program)
-
-$(program): $(OBJS) buildtime.o $(DEP_LIBS)
-	rm -f $(program)
-	$(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) buildtime.o $(DEP_LIBS) $(LIBS) $(EXTRA_LIBS)
-
-buildtime.o: $(OBJS) $(DEP_LIBS)
-
-# followed by boilerplate.mk
diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
new file mode 100644
index 0000000..52c3276
--- /dev/null
+++ b/unix/x0vncserver/Makefile.am
@@ -0,0 +1,15 @@
+bin_PROGRAMS = x0vncserver
+
+x0vncserver_SOURCES = Image.cxx TimeMillis.cxx PollingScheduler.cxx \
+	PollingManager.cxx Geometry.cxx XPixelBuffer.cxx x0vncserver.cxx \
+	../vncconfig/QueryConnectDialog.cxx buildtime.c
+
+# X_CFLAGS are really CPPFLAGS
+x0vncserver_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
+	-I$(top_srcdir)/vncconfig @XTEST_DEFINE@ @READDISPLAY_DEFINE@ \
+	@MITSHM_DEFINE@ @X_CFLAGS@
+
+x0vncserver_LDADD = $(COMMON_DIR)/rfb/librfb.la \
+	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+	$(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
+	@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ @DMEDIA_LIB@
diff --git a/unix/x0vncserver/Makefile.in b/unix/x0vncserver/Makefile.in
deleted file mode 100644
index ade1526..0000000
--- a/unix/x0vncserver/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-SRCS = Image.cxx TimeMillis.cxx PollingScheduler.cxx PollingManager.cxx \
-       Geometry.cxx XPixelBuffer.cxx \
-       x0vncserver.cxx ../vncconfig/QueryConnectDialog.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-program = x0vncserver
-
-DEP_LIBS = $(COMMON)/rfb/librfb.a \
-           $(COMMON)/network/libnetwork.a \
-           $(COMMON)/rdr/librdr.a \
-	   $(TOP)/tx/libtx.a
-
-EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
-             @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ @DMEDIA_LIB@
-
-# X_CFLAGS are really CPPFLAGS
-DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/vncconfig \
-  @XTEST_DEFINE@ @READDISPLAY_DEFINE@ @MITSHM_DEFINE@ @X_CFLAGS@
-
-all:: $(program)
-
-$(program): $(OBJS) buildtime.o $(DEP_LIBS)
-	rm -f $(program)
-	$(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) buildtime.o $(DEP_LIBS) $(LIBS) $(EXTRA_LIBS)
-
-buildtime.o: $(OBJS) $(DEP_LIBS)
-
-# followed by boilerplate.mk