diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 7a790b9e..467d1b8e 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,6 @@
 2007-12-30  Arnim Laeuger  <arniml@users.sourceforge.net>
 
+    * data/Makefile.am (nobase_dist_pkgdata_DATA): fixed merge results
     * many files: integration of BSDL parser
     * data/xilinx/PARTS: added xc2v80-fg256,xc2v250-fg256,xc2v1000-fg256
       '[ 1859678 ] jtag support for xilinx xc2v80-fg256, xc2v250, xc2v1000 FPGA' (Alexander Didebulidze)
diff --git a/jtag/data/Makefile.am b/jtag/data/Makefile.am
index f0bf28b1..d99ff9c1 100644
--- a/jtag/data/Makefile.am
+++ b/jtag/data/Makefile.am
@@ -59,7 +59,6 @@ nobase_dist_pkgdata_DATA = \
 	analog/bf533/bf533 \
 	analog/PARTS \
 	analog/sharc21065l/STEPPINGS \
-	analog/sharc21065l/sharc21065l
 	analog/sharc21065l/sharc21065l \
 	brecis/PARTS \
 	brecis/msp2006/STEPPINGS \