diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index cf199f18..d7bf4b0a 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -98,6 +98,9 @@
 
   * THANKS: Rutger Hofman was missing.
 
+  * Makefile.am, src/bus/Makefile.am, src/cmd/Makefile.am,
+    src/flash/Makefile.am, src/tap/Makefile.am: Add missing dist files.
+
 2010-01-22  Mike Frysinger  <vapier@gentoo.org>
 
   * src/cmd/cmd_bit.c (cmd_bit_print_params): Fix strncat length handling.
diff --git a/urjtag/Makefile.am b/urjtag/Makefile.am
index 673330d4..79987075 100644
--- a/urjtag/Makefile.am
+++ b/urjtag/Makefile.am
@@ -46,6 +46,9 @@ DIST_SUBDIRS = \
 
 EXTRA_DIST = \
 	Makefile.rules \
+	MAINTAINERS \
+	sysdep.h \
+	urjtag.i \
 	UrJTAG.nsi \
 	tools/config.rpath
 
diff --git a/urjtag/src/bus/Makefile.am b/urjtag/src/bus/Makefile.am
index 10dd266f..8261ee9c 100644
--- a/urjtag/src/bus/Makefile.am
+++ b/urjtag/src/bus/Makefile.am
@@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libbus.la
 libbus_la_SOURCES = \
 	buses.c \
 	buses.h \
+	buses_list.h \
 	generic_bus.c \
 	generic_bus.h \
 	pxa2x0_mc.h \
diff --git a/urjtag/src/cmd/Makefile.am b/urjtag/src/cmd/Makefile.am
index fd8a8bb9..0b1402ad 100644
--- a/urjtag/src/cmd/Makefile.am
+++ b/urjtag/src/cmd/Makefile.am
@@ -26,6 +26,8 @@ include $(top_srcdir)/Makefile.rules
 noinst_LTLIBRARIES = libcmd.la
 
 libcmd_la_SOURCES = \
+	cmd.h \
+	cmd_list.h \
 	cmd_frequency.c \
 	cmd_cable.c \
 	cmd_reset.c \
diff --git a/urjtag/src/flash/Makefile.am b/urjtag/src/flash/Makefile.am
index ac1b09f2..24879c96 100644
--- a/urjtag/src/flash/Makefile.am
+++ b/urjtag/src/flash/Makefile.am
@@ -27,12 +27,18 @@ noinst_LTLIBRARIES = libflash.la
 
 libflash_la_SOURCES = \
 	amd.c \
+	amd.h \
 	amd_flash.c \
 	cfi.c \
+	cfi.h \
 	detectflash.c \
 	flash.c \
+	flash.h \
 	intel.c \
-	jedec.c
+	intel.h \
+	jedec.c \
+	jedec.h \
+	mic.h
 
 if JEDEC_EXP
 libflash_la_SOURCES += \
diff --git a/urjtag/src/tap/Makefile.am b/urjtag/src/tap/Makefile.am
index a06bb78b..b84b2220 100644
--- a/urjtag/src/tap/Makefile.am
+++ b/urjtag/src/tap/Makefile.am
@@ -34,12 +34,19 @@ libtap_la_SOURCES = \
 	discovery.c \
 	idcode.c \
 	parport.c \
+	parport.h \
+	parport_list.h \
 	usbconn.c \
+	usbconn.h \
+	usbconn_list.h \
 	cable.c \
+	cable.h \
+	cable_list.h \
 	cable/generic.h \
 	cable/generic.c \
 	cable/generic_usbconn.h \
 	cable/generic_usbconn.c \
+	cable/generic_usbconn_list.h \
 	cable/generic_parport.h \
 	cable/generic_parport.c \
 	cable/cmd_xfer.h \
@@ -114,7 +121,8 @@ endif
 
 if ENABLE_CABLE_FT2232
 libtap_la_SOURCES += \
-	cable/ft2232.c
+	cable/ft2232.c \
+	cable/ft2232_list.h
 endif
 
 if ENABLE_CABLE_TS7800
@@ -125,7 +133,7 @@ endif
 
 if HAVE_LIBUSB
 libtap_la_SOURCES += \
-	usbconn/libusb.c
+	usbconn/libusb.c \
 	usbconn/libusb.h
 endif