diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
new file mode 100644
index 0000000..47d79b8
--- /dev/null
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -0,0 +1,61 @@
+LIB_DIR=$(top_srcdir)/../../common
+BIN_DIR=$(top_srcdir)/..
+
+RFB_LIB=$(LIB_DIR)/rfb/librfb.la
+RDR_LIB=$(LIB_DIR)/rdr/librdr.la
+NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
+COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB)
+
+noinst_LTLIBRARIES = libvnccommon.la
+
+libvnccommon_la_SOURCES = vncExtInit.cc vncHooks.cc XserverDesktop.cc
+
+libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+	-I$(BIN_DIR)/vncconfig -DGC_HAS_COMPOSITE_CLIP $(XVNC_CPPFLAGS) \
+	-I$(includedir)/pixman-1
+
+bin_PROGRAMS = Xvnc
+
+Xvnc_SOURCES = xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c \
+	$(top_srcdir)/Xi/stubs.c $(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/fb/fbcmap_mi.c buildtime.c
+
+nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h
+
+Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
+	-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+	-I$(top_srcdir)/include -I$(includedir)/pixman-1
+
+Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
+	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
+
+libvnc_la_LTLIBRARIES = libvnc.la
+libvnc_ladir = $(moduledir)/extensions
+
+libvnc_la_SOURCES = xf86vncModule.cc
+
+libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) \
+	-I$(top_srcdir)/hw/xfree86/common \
+	-I$(top_srcdir)/hw/xfree86/os-support \
+	-I$(top_srcdir)/hw/xfree86/os-support/bus \
+	-DXFree86Module -DXFree86LOADER -DIN_MODULE \
+	-I$(includedir)/pixman-1
+
+libvnc_la_LDFLAGS = -module -avoid-version
+
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIB)
+
+# C++ hacks
+BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
+
+fb.h: $(top_srcdir)/fb/fb.h
+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
+
+pixman.h: $(includedir)/pixman-1/pixman.h
+	cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
+
+fbrop.h: $(top_srcdir)/fb/fbrop.h
+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
+