diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index b554f71d..feec7caa 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,7 +1,14 @@
+2008-12-09  Kolja Waschk <kawk>
+
+   * data/broadcom/bcm6358, data/broadcom/bcm6358/bcm6358,
+     data/broadcom/bcm6358/STEPPINGS, data/broadcom/PARTS:
+     [ 2412479 ] neufbox4 support. BCM6358 data files (by
+     Julien Aube, slightly modified)
+
 2008-12-08 Julien Aube  <obconseil@gmail.com>
 
-   * src/bus/ejtag_dma.c:
-     Support for ejtag in DMA mode.
+   * src/bus/ejtag_dma.c, src/bus/Makefile.am, src/bus/buses.c,
+	 src/bus/buses.h, configure.ac: [ 2412486 ] Support for ejtag in DMA mode.
 
 2008-12-07  Mike Frysinger  <vapier@gentoo.org>
 
diff --git a/jtag/data/broadcom/PARTS b/jtag/data/broadcom/PARTS
index b9024194..0c0c66b2 100644
--- a/jtag/data/broadcom/PARTS
+++ b/jtag/data/broadcom/PARTS
@@ -26,3 +26,4 @@
 0011001100010000	bcm3310		BCM3310
 0101010000100001	bcm5421s	BCM5421S
 0100011100010010	bcm4712		BCM4712
+0110001101011000	bcm6358		BCM6358
diff --git a/jtag/data/broadcom/bcm6358/STEPPINGS b/jtag/data/broadcom/bcm6358/STEPPINGS
new file mode 100644
index 00000000..b6050907
--- /dev/null
+++ b/jtag/data/broadcom/bcm6358/STEPPINGS
@@ -0,0 +1,22 @@
+#
+# $Id: STEPPINGS 442 2003-05-26 09:04:38Z telka $
+#
+# Copyright (C) 2008 Julien Aube
+#
+# 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.
+
+0000	bcm6358	V1
+
diff --git a/jtag/data/broadcom/bcm6358/bcm6358 b/jtag/data/broadcom/bcm6358/bcm6358
new file mode 100644
index 00000000..6ae537da
--- /dev/null
+++ b/jtag/data/broadcom/bcm6358/bcm6358
@@ -0,0 +1,53 @@
+#
+# $Id$
+#
+# JTAG declarations for Atheros AR2312
+# Also valid for Broadcom BCM6358 (J. Aube)
+# 
+# Copyright (C) 2005 Marek Michalkiewicz
+#
+# 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.
+#
+# Written by Marek Michalkiewicz <marekm@amelek.gda.pl>, 2005.
+#
+
+register	BR		 1
+register	BSR		 1
+register	DIR		32
+register	EJIMPCODE	32
+register	EJADDRESS	32
+register	EJDATA		32
+register	EJCONTROL	32
+register	EJALL		96
+register	EJFASTDATA	33
+
+instruction length 5
+
+instruction	BYPASS		11111	BR
+instruction	SAMPLE/PRELOAD	00010	BSR
+instruction	IDCODE		00001	DIR
+instruction	EJTAG_IMPCODE	00011	EJIMPCODE
+instruction	EJTAG_ADDRESS	01000	EJADDRESS
+instruction	EJTAG_DATA	01001	EJDATA
+instruction	EJTAG_CONTROL	01010	EJCONTROL
+instruction	EJTAG_ALL	01011	EJALL
+instruction	EJTAGBOOT	01100	BR
+instruction	NORMALBOOT	01101	BR
+instruction	EJTAG_FASTDATA	01110	EJFASTDATA
+
+endian big
+initbus ejtag_dma
+