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