diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index b3fdf5f5..10558e1c 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-27  Jie Zhang  <jie.zhang@analog.com>
+
+  * include/urjtag/Makefile.am (pkginclude_HEADERS): Remove urjtag.h.
+  * extra/fjmem/Makefile.am: New file.
+  * src/jim/Makefile.am (EXTRA_DIST): New.
+  * src/pld/Makefile.am (libpld_la_SOURCES): Add xilinx.h.
+  * src/bus/Makefile.am (libbus_la_SOURCES): Add blackfin.h.
+  * src/bfin/Makefile.am (libbfin_la_SOURCES): Add bfin-part.h.
+  * configure.ac: Add extra/fjmem/Makefile to AC_CONFIG_FILES.
+  * data/Makefile.am (nobase_dist_pkgdata_DATA): Add
+    xilinx/xc18v02pc44/xc18v02pc44 and xilinx/xc18v02pc44/STEPPINGS.
+  * Makefile.am (SUBDIRS): Add extra/fjmem.
+
 2011-06-27  Mike Frysinger  <vapier@gentoo.org>
 
   * include/urjtag/cmd.h, src/cmd/cmd.h, src/cmd/cmd_cmd.c: Move prototypes
diff --git a/urjtag/Makefile.am b/urjtag/Makefile.am
index 79987075..66c29769 100644
--- a/urjtag/Makefile.am
+++ b/urjtag/Makefile.am
@@ -25,6 +25,7 @@ include $(top_srcdir)/Makefile.rules
 
 SUBDIRS = \
 	doc \
+	extra/fjmem \
 	include/urjtag \
 	data \
 	src \
diff --git a/urjtag/configure.ac b/urjtag/configure.ac
index 2a16f6da..45604315 100644
--- a/urjtag/configure.ac
+++ b/urjtag/configure.ac
@@ -68,6 +68,7 @@ AC_CONFIG_FILES(
 	Makefile
 	doc/Makefile
 	data/Makefile
+	extra/fjmem/Makefile
 	include/urjtag/Makefile
 	src/Makefile
 	src/urjtag.pc
diff --git a/urjtag/data/Makefile.am b/urjtag/data/Makefile.am
index a0f6fb90..35d5e79d 100644
--- a/urjtag/data/Makefile.am
+++ b/urjtag/data/Makefile.am
@@ -191,6 +191,8 @@ nobase_dist_pkgdata_DATA = \
 	toshiba/tx4926/STEPPINGS \
 	toshiba/tx4926/tx4926 \
 	xilinx/PARTS \
+	xilinx/xc18v02pc44/xc18v02pc44 \
+	xilinx/xc18v02pc44/STEPPINGS \
 	xilinx/xc18v04pc44/xc18v04pc44 \
 	xilinx/xc18v04pc44/STEPPINGS \
 	xilinx/xc2c256-tq144/STEPPINGS \
diff --git a/urjtag/extra/fjmem/Makefile.am b/urjtag/extra/fjmem/Makefile.am
new file mode 100644
index 00000000..8cd3a437
--- /dev/null
+++ b/urjtag/extra/fjmem/Makefile.am
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2011 Analog Devices, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+
+include $(top_srcdir)/Makefile.rules
+
+EXTRA_DIST = \
+	fjmem_config_pack_cyclone-p.vhd \
+	fjmem_config_pack_spartan3-p.vhd \
+	fjmem_config_pack_spartan6-p.vhd \
+	fjmem_core.vhd \
+	fjmem_cyclone.vhd \
+	fjmem_pack-p.vhd \
+	fjmem_spartan3.vhd \
+	fjmem_spartan6.vhd \
+	generic_ram_ena.vhd \
+	README
+
diff --git a/urjtag/include/urjtag/Makefile.am b/urjtag/include/urjtag/Makefile.am
index 0f0cb9e1..bdbf07bb 100644
--- a/urjtag/include/urjtag/Makefile.am
+++ b/urjtag/include/urjtag/Makefile.am
@@ -56,5 +56,4 @@ pkginclude_HEADERS = \
 	tap.h \
 	svf.h \
 	types.h \
-	urjtag.h \
 	usbconn.h
diff --git a/urjtag/src/bfin/Makefile.am b/urjtag/src/bfin/Makefile.am
index a7a82c3c..716e23a6 100644
--- a/urjtag/src/bfin/Makefile.am
+++ b/urjtag/src/bfin/Makefile.am
@@ -29,6 +29,7 @@ libbfin_la_SOURCES = \
 	insn-gen.c \
 	bfin.c \
 	bfin-part.c \
+	bfin-part.h \
 	bfin-part-bfin.c
 
 AM_CFLAGS = $(WARNINGCFLAGS)
diff --git a/urjtag/src/bus/Makefile.am b/urjtag/src/bus/Makefile.am
index f1c85525..863c7afc 100644
--- a/urjtag/src/bus/Makefile.am
+++ b/urjtag/src/bus/Makefile.am
@@ -54,6 +54,7 @@ endif
 if ENABLE_BUS_BLACKFIN
 libbus_la_SOURCES += \
 	blackfin.c \
+	blackfin.h \
 	bf518f_ezbrd.c \
 	bf533_stamp.c \
 	bf537_stamp.c \
diff --git a/urjtag/src/jim/Makefile.am b/urjtag/src/jim/Makefile.am
index 971ea901..0a78144c 100644
--- a/urjtag/src/jim/Makefile.am
+++ b/urjtag/src/jim/Makefile.am
@@ -30,4 +30,8 @@ libjim_la_SOURCES = \
 	some_cpu.c \
 	intel_28f800b3.c
 
+EXTRA_DIST = \
+	README.jim \
+	some_cpu.bsd
+
 AM_CFLAGS = $(WARNINGCFLAGS)
diff --git a/urjtag/src/pld/Makefile.am b/urjtag/src/pld/Makefile.am
index 08244b38..fc8d903d 100644
--- a/urjtag/src/pld/Makefile.am
+++ b/urjtag/src/pld/Makefile.am
@@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libpld.la
 libpld_la_SOURCES = \
 	pld.c \
 	xilinx_bitstream.c \
-	xilinx.c
+	xilinx.c \
+	xilinx.h
 
 AM_CFLAGS = $(WARNINGCFLAGS)