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