diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index da9e47bb..f9104ffa 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -6,6 +6,12 @@
   * src/tap/cable/generic_usbconn.h: Add new "interface" option to usage.
     Patch by Michael Walle.
 
+  * data/Makefile.am, data/xilinx/PARTS, data/xilinx/xc2c32a-cp56/STEPPINGS,
+    data/xilinx/xc2c32a-cp56/xc2c32a-cp56, data/xilinx/xc2c32a-cv64/STEPPINGS,
+    data/xilinx/xc2c32a-cv64/xc2c32a-cv64, data/xilinx/xc2c32a-vq44/STEPPINGS,
+    data/xilinx/xc2c32a-vq44/xc2c32a-vq44: Add Xilinx CoolRunner-II info from
+    Michael Walle.
+
 2011-04-30  Mike Frysinger  <vapier@gentoo.org>
 
   * configure.ac: Force recent versions of autotools (at least ones released
diff --git a/urjtag/data/Makefile.am b/urjtag/data/Makefile.am
index 6b5794ef..a0f6fb90 100644
--- a/urjtag/data/Makefile.am
+++ b/urjtag/data/Makefile.am
@@ -197,6 +197,12 @@ nobase_dist_pkgdata_DATA = \
 	xilinx/xc2c256-tq144/xc2c256-tq144 \
 	xilinx/xc2c256-vq100/STEPPINGS \
 	xilinx/xc2c256-vq100/xc2c256-vq100 \
+	xilinx/xc2c32a-vq44/STEPPINGS \
+	xilinx/xc2c32a-vq44/xc2c32a-vq44 \
+	xilinx/xc2c32a-cp56/STEPPINGS \
+	xilinx/xc2c32a-cp56/xc2c32a-cp56 \
+	xilinx/xc2c32a-cv64/STEPPINGS \
+	xilinx/xc2c32a-cv64/xc2c32a-cv64 \
 	xilinx/xc2c64a-vq44/STEPPINGS \
 	xilinx/xc2c64a-vq44/xc2c64a-vq44 \
 	xilinx/xc2s200e-pq208/STEPPINGS \
diff --git a/urjtag/data/xilinx/PARTS b/urjtag/data/xilinx/PARTS
index 663fe69c..94edb539 100644
--- a/urjtag/data/xilinx/PARTS
+++ b/urjtag/data/xilinx/PARTS
@@ -31,6 +31,10 @@
 0110110101001100	xc2c256-tq144		XC2C256-TQ144
 0110111001011110	xc2c64a-vq44		XC2C64-VQ44
 0000101000100000	xc2s300e		XC2S300E
+# XC2C
+0110111000011010    xc2c32a-cv64	xc2c32a-cv64
+0110111000011011    xc2c32a-cp56	xc2c32a-cp56
+0110111000011100    xc2c32a-vq44	xc2c32a-vq44
 # System ACE
 1010000000000001	xccace	xccace
 # XC3S / XC3SE / XC3A
diff --git a/urjtag/data/xilinx/xc2c32a-cp56/STEPPINGS b/urjtag/data/xilinx/xc2c32a-cp56/STEPPINGS
new file mode 100644
index 00000000..1ad21703
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-cp56/STEPPINGS
@@ -0,0 +1 @@
+0000	xc2c32a-cp56	0
diff --git a/urjtag/data/xilinx/xc2c32a-cp56/xc2c32a-cp56 b/urjtag/data/xilinx/xc2c32a-cp56/xc2c32a-cp56
new file mode 100644
index 00000000..7ce703e1
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-cp56/xc2c32a-cp56
@@ -0,0 +1,170 @@
+signal VDD(0)
+signal VDD(1)
+signal VDD(2)
+signal GND(0)
+signal GND(1)
+signal GND(2)
+signal IN_32
+signal IO_31
+signal IO_30
+signal IO_29
+signal IO_28
+signal IO_27
+signal IO_26
+signal IO_25
+signal IO_24
+signal IO_23
+signal IO_22
+signal IO_21
+signal IO_20
+signal IO_19
+signal IO_18
+signal IO_17
+signal IO_16
+signal IO_15
+signal IO_14
+signal IO_13
+signal IO_12
+signal IO_11
+signal IO_10
+signal IO_9
+signal IO_8
+signal IO_7
+signal IO_6
+signal IO_5
+signal IO_4
+signal IO_3
+signal IO_2
+signal IO_1
+signal IO_0
+signal TMS
+signal TDO
+signal TDI
+signal TCK
+instruction length 8
+register DIR 32
+register USERCODE 32
+register BSR 97
+register BYPASS 1
+register ISC_DEFAULT 1
+register DATAREG 266
+instruction ISC_NOOP 11100000 ISC_DEFAULT
+instruction TEST_DISABLE 00010101 DATAREG
+instruction MVERIFY 00010011 DATAREG
+instruction ERASE_ALL 00010100 DATAREG
+instruction BULKPROG 00010010 DATAREG
+instruction TEST_ENABLE 00010001 DATAREG
+instruction ISC_DISABLE 11000000 DATAREG
+instruction ISC_INIT 11110000 DATAREG
+instruction ISC_READ 11101110 DATAREG
+instruction ISC_PROGRAM 11101010 DATAREG
+instruction ISC_ERASE 11101101 DATAREG
+instruction ISC_SRAM_WRITE 11100110 DATAREG
+instruction ISC_SRAM_READ 11100111 DATAREG
+instruction ISC_ENABLE 11101000 DATAREG
+instruction ISC_ENABLEOTF 11100100 DATAREG
+instruction ISC_ENABLE_CLAMP 11101001 ISC_DEFAULT
+instruction HIGHZ 11111100 BYPASS
+instruction USERCODE 11111101 DIR
+instruction IDCODE 00000001 DIR
+instruction EXTEST 00000000 BSR
+instruction SAMPLE/PRELOAD 00000011 BSR
+instruction BYPASS 11111111 BYPASS
+instruction INTEST 00000010 BSR
+bit 96 I ? IO_0
+bit 95 O ? IO_0 94 0 Z
+bit 94 C 0 *
+bit 93 I ? IO_1
+bit 92 O ? IO_1 91 0 Z
+bit 91 C 0 *
+bit 90 I ? IO_2
+bit 89 O ? IO_2 88 0 Z
+bit 88 C 0 *
+bit 87 I ? IO_3
+bit 86 O ? IO_3 85 0 Z
+bit 85 C 0 *
+bit 84 I ? IO_4
+bit 83 O ? IO_4 82 0 Z
+bit 82 C 0 *
+bit 81 I ? IO_5
+bit 80 O ? IO_5 79 0 Z
+bit 79 C 0 *
+bit 78 I ? IO_6
+bit 77 O ? IO_6 76 0 Z
+bit 76 C 0 *
+bit 75 I ? IO_7
+bit 74 O ? IO_7 73 0 Z
+bit 73 C 0 *
+bit 72 I ? IO_8
+bit 71 O ? IO_8 70 0 Z
+bit 70 C 0 *
+bit 69 I ? IO_9
+bit 68 O ? IO_9 67 0 Z
+bit 67 C 0 *
+bit 66 I ? IO_10
+bit 65 O ? IO_10 64 0 Z
+bit 64 C 0 *
+bit 63 I ? IO_11
+bit 62 O ? IO_11 61 0 Z
+bit 61 C 0 *
+bit 60 I ? IO_12
+bit 59 O ? IO_12 58 0 Z
+bit 58 C 0 *
+bit 57 I ? IO_13
+bit 56 O ? IO_13 55 0 Z
+bit 55 C 0 *
+bit 54 I ? IO_14
+bit 53 O ? IO_14 52 0 Z
+bit 52 C 0 *
+bit 51 I ? IO_15
+bit 50 O ? IO_15 49 0 Z
+bit 49 C 0 *
+bit 48 I ? IO_16
+bit 47 O ? IO_16 46 0 Z
+bit 46 C 0 *
+bit 45 I ? IO_17
+bit 44 O ? IO_17 43 0 Z
+bit 43 C 0 *
+bit 42 I ? IO_18
+bit 41 O ? IO_18 40 0 Z
+bit 40 C 0 *
+bit 39 I ? IO_19
+bit 38 O ? IO_19 37 0 Z
+bit 37 C 0 *
+bit 36 I ? IO_20
+bit 35 O ? IO_20 34 0 Z
+bit 34 C 0 *
+bit 33 I ? IO_21
+bit 32 O ? IO_21 31 0 Z
+bit 31 C 0 *
+bit 30 I ? IO_22
+bit 29 O ? IO_22 28 0 Z
+bit 28 C 0 *
+bit 27 I ? IO_23
+bit 26 O ? IO_23 25 0 Z
+bit 25 C 0 *
+bit 24 I ? IO_24
+bit 23 O ? IO_24 22 0 Z
+bit 22 C 0 *
+bit 21 I ? IO_25
+bit 20 O ? IO_25 19 0 Z
+bit 19 C 0 *
+bit 18 I ? IO_26
+bit 17 O ? IO_26 16 0 Z
+bit 16 C 0 *
+bit 15 I ? IO_27
+bit 14 O ? IO_27 13 0 Z
+bit 13 C 0 *
+bit 12 I ? IO_28
+bit 11 O ? IO_28 10 0 Z
+bit 10 C 0 *
+bit 9 I ? IO_29
+bit 8 O ? IO_29 7 0 Z
+bit 7 C 0 *
+bit 6 I ? IO_30
+bit 5 O ? IO_30 4 0 Z
+bit 4 C 0 *
+bit 3 I ? IO_31
+bit 2 O ? IO_31 1 0 Z
+bit 1 C 0 *
+bit 0 I ? IN_32
diff --git a/urjtag/data/xilinx/xc2c32a-cv64/STEPPINGS b/urjtag/data/xilinx/xc2c32a-cv64/STEPPINGS
new file mode 100644
index 00000000..95880918
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-cv64/STEPPINGS
@@ -0,0 +1 @@
+0000	xc2c32a-cv64	0
diff --git a/urjtag/data/xilinx/xc2c32a-cv64/xc2c32a-cv64 b/urjtag/data/xilinx/xc2c32a-cv64/xc2c32a-cv64
new file mode 100644
index 00000000..923733c7
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-cv64/xc2c32a-cv64
@@ -0,0 +1,164 @@
+signal IN32
+signal IO_lb01_15
+signal IO_lb01_14
+signal IO_lb01_13
+signal IO_lb01_12
+signal IO_lb01_11
+signal IO_lb01_10
+signal IO_lb01_09
+signal IO_lb01_08
+signal IO_lb01_07
+signal IO_lb01_06
+signal IO_lb01_05
+signal IO_lb01_04
+signal IO_lb01_03
+signal IO_lb01_02
+signal IO_lb01_01
+signal IO_lb01_00
+signal IO_lb00_15
+signal IO_lb00_14
+signal IO_lb00_13
+signal IO_lb00_12
+signal IO_lb00_11
+signal IO_lb00_10
+signal IO_lb00_09
+signal IO_lb00_08
+signal IO_lb00_07
+signal IO_lb00_06
+signal IO_lb00_05
+signal IO_lb00_04
+signal IO_lb00_03
+signal IO_lb00_02
+signal IO_lb00_01
+signal IO_lb00_00
+signal TMS
+signal TCK
+signal TDO
+signal TDI
+instruction length 8
+register DIR 32
+register USERCODE 32
+register BSR 97
+register BYPASS 1
+register ISC_DEFAULT 1
+register DATAREG 266
+instruction ISC_NOOP 11100000 ISC_DEFAULT
+instruction TEST_DISABLE 00010101 DATAREG
+instruction MVERIFY 00010011 DATAREG
+instruction ERASE_ALL 00010100 DATAREG
+instruction BULKPROG 00010010 DATAREG
+instruction TEST_ENABLE 00010001 DATAREG
+instruction ISC_DISABLE 11000000 DATAREG
+instruction ISC_INIT 11110000 DATAREG
+instruction ISC_READ 11101110 DATAREG
+instruction ISC_PROGRAM 11101010 DATAREG
+instruction ISC_ERASE 11101101 DATAREG
+instruction ISC_SRAM_WRITE 11100110 DATAREG
+instruction ISC_SRAM_READ 11100111 DATAREG
+instruction ISC_ENABLE 11101000 DATAREG
+instruction ISC_ENABLEOTF 11100100 DATAREG
+instruction ISC_ENABLE_CLAMP 11101001 ISC_DEFAULT
+instruction HIGHZ 11111100 BYPASS
+instruction USERCODE 11111101 DIR
+instruction IDCODE 00000001 DIR
+instruction EXTEST 00000000 BSR
+instruction SAMPLE/PRELOAD 00000011 BSR
+instruction BYPASS 11111111 BYPASS
+instruction INTEST 00000010 BSR
+bit 96 I ? IO_lb00_00
+bit 95 O ? IO_lb00_00 94 0 Z
+bit 94 C ? *
+bit 93 I ? IO_lb00_01
+bit 92 O ? IO_lb00_01 91 0 Z
+bit 91 C ? *
+bit 90 I ? IO_lb00_02
+bit 89 O ? IO_lb00_02 88 0 Z
+bit 88 C ? *
+bit 87 I ? IO_lb00_03
+bit 86 O ? IO_lb00_03 85 0 Z
+bit 85 C ? *
+bit 84 I ? IO_lb00_04
+bit 83 O ? IO_lb00_04 82 0 Z
+bit 82 C ? *
+bit 81 I ? IO_lb00_05
+bit 80 O ? IO_lb00_05 79 0 Z
+bit 79 C ? *
+bit 78 I ? IO_lb00_06
+bit 77 O ? IO_lb00_06 76 0 Z
+bit 76 C ? *
+bit 75 I ? IO_lb00_07
+bit 74 O ? IO_lb00_07 73 0 Z
+bit 73 C ? *
+bit 72 I ? IO_lb00_08
+bit 71 O ? IO_lb00_08 70 0 Z
+bit 70 C ? *
+bit 69 I ? IO_lb00_09
+bit 68 O ? IO_lb00_09 67 0 Z
+bit 67 C ? *
+bit 66 I ? IO_lb00_10
+bit 65 O ? IO_lb00_10 64 0 Z
+bit 64 C ? *
+bit 63 I ? IO_lb00_11
+bit 62 O ? IO_lb00_11 61 0 Z
+bit 61 C ? *
+bit 60 I ? IO_lb00_12
+bit 59 O ? IO_lb00_12 58 0 Z
+bit 58 C ? *
+bit 57 I ? IO_lb00_13
+bit 56 O ? IO_lb00_13 55 0 Z
+bit 55 C ? *
+bit 54 I ? IO_lb00_14
+bit 53 O ? IO_lb00_14 52 0 Z
+bit 52 C ? *
+bit 51 I ? IO_lb00_15
+bit 50 O ? IO_lb00_15 49 0 Z
+bit 49 C ? *
+bit 48 I ? IO_lb01_00
+bit 47 O ? IO_lb01_00 46 0 Z
+bit 46 C ? *
+bit 45 I ? IO_lb01_01
+bit 44 O ? IO_lb01_01 43 0 Z
+bit 43 C ? *
+bit 42 I ? IO_lb01_02
+bit 41 O ? IO_lb01_02 40 0 Z
+bit 40 C ? *
+bit 39 I ? IO_lb01_03
+bit 38 O ? IO_lb01_03 37 0 Z
+bit 37 C ? *
+bit 36 I ? IO_lb01_04
+bit 35 O ? IO_lb01_04 34 0 Z
+bit 34 C ? *
+bit 33 I ? IO_lb01_05
+bit 32 O ? IO_lb01_05 31 0 Z
+bit 31 C ? *
+bit 30 I ? IO_lb01_06
+bit 29 O ? IO_lb01_06 28 0 Z
+bit 28 C ? *
+bit 27 I ? IO_lb01_07
+bit 26 O ? IO_lb01_07 25 0 Z
+bit 25 C ? *
+bit 24 I ? IO_lb01_08
+bit 23 O ? IO_lb01_08 22 0 Z
+bit 22 C ? *
+bit 21 I ? IO_lb01_09
+bit 20 O ? IO_lb01_09 19 0 Z
+bit 19 C ? *
+bit 18 I ? IO_lb01_10
+bit 17 O ? IO_lb01_10 16 0 Z
+bit 16 C ? *
+bit 15 I ? IO_lb01_11
+bit 14 O ? IO_lb01_11 13 0 Z
+bit 13 C ? *
+bit 12 I ? IO_lb01_12
+bit 11 O ? IO_lb01_12 10 0 Z
+bit 10 C ? *
+bit 9 I ? IO_lb01_13
+bit 8 O ? IO_lb01_13 7 0 Z
+bit 7 C ? *
+bit 6 I ? IO_lb01_14
+bit 5 O ? IO_lb01_14 4 0 Z
+bit 4 C ? *
+bit 3 I ? IO_lb01_15
+bit 2 O ? IO_lb01_15 1 0 Z
+bit 1 C ? *
+bit 0 I ? IN32
diff --git a/urjtag/data/xilinx/xc2c32a-vq44/STEPPINGS b/urjtag/data/xilinx/xc2c32a-vq44/STEPPINGS
new file mode 100644
index 00000000..6c0221ed
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-vq44/STEPPINGS
@@ -0,0 +1 @@
+0000	xc2c32a-vq44	0
diff --git a/urjtag/data/xilinx/xc2c32a-vq44/xc2c32a-vq44 b/urjtag/data/xilinx/xc2c32a-vq44/xc2c32a-vq44
new file mode 100644
index 00000000..7ce703e1
--- /dev/null
+++ b/urjtag/data/xilinx/xc2c32a-vq44/xc2c32a-vq44
@@ -0,0 +1,170 @@
+signal VDD(0)
+signal VDD(1)
+signal VDD(2)
+signal GND(0)
+signal GND(1)
+signal GND(2)
+signal IN_32
+signal IO_31
+signal IO_30
+signal IO_29
+signal IO_28
+signal IO_27
+signal IO_26
+signal IO_25
+signal IO_24
+signal IO_23
+signal IO_22
+signal IO_21
+signal IO_20
+signal IO_19
+signal IO_18
+signal IO_17
+signal IO_16
+signal IO_15
+signal IO_14
+signal IO_13
+signal IO_12
+signal IO_11
+signal IO_10
+signal IO_9
+signal IO_8
+signal IO_7
+signal IO_6
+signal IO_5
+signal IO_4
+signal IO_3
+signal IO_2
+signal IO_1
+signal IO_0
+signal TMS
+signal TDO
+signal TDI
+signal TCK
+instruction length 8
+register DIR 32
+register USERCODE 32
+register BSR 97
+register BYPASS 1
+register ISC_DEFAULT 1
+register DATAREG 266
+instruction ISC_NOOP 11100000 ISC_DEFAULT
+instruction TEST_DISABLE 00010101 DATAREG
+instruction MVERIFY 00010011 DATAREG
+instruction ERASE_ALL 00010100 DATAREG
+instruction BULKPROG 00010010 DATAREG
+instruction TEST_ENABLE 00010001 DATAREG
+instruction ISC_DISABLE 11000000 DATAREG
+instruction ISC_INIT 11110000 DATAREG
+instruction ISC_READ 11101110 DATAREG
+instruction ISC_PROGRAM 11101010 DATAREG
+instruction ISC_ERASE 11101101 DATAREG
+instruction ISC_SRAM_WRITE 11100110 DATAREG
+instruction ISC_SRAM_READ 11100111 DATAREG
+instruction ISC_ENABLE 11101000 DATAREG
+instruction ISC_ENABLEOTF 11100100 DATAREG
+instruction ISC_ENABLE_CLAMP 11101001 ISC_DEFAULT
+instruction HIGHZ 11111100 BYPASS
+instruction USERCODE 11111101 DIR
+instruction IDCODE 00000001 DIR
+instruction EXTEST 00000000 BSR
+instruction SAMPLE/PRELOAD 00000011 BSR
+instruction BYPASS 11111111 BYPASS
+instruction INTEST 00000010 BSR
+bit 96 I ? IO_0
+bit 95 O ? IO_0 94 0 Z
+bit 94 C 0 *
+bit 93 I ? IO_1
+bit 92 O ? IO_1 91 0 Z
+bit 91 C 0 *
+bit 90 I ? IO_2
+bit 89 O ? IO_2 88 0 Z
+bit 88 C 0 *
+bit 87 I ? IO_3
+bit 86 O ? IO_3 85 0 Z
+bit 85 C 0 *
+bit 84 I ? IO_4
+bit 83 O ? IO_4 82 0 Z
+bit 82 C 0 *
+bit 81 I ? IO_5
+bit 80 O ? IO_5 79 0 Z
+bit 79 C 0 *
+bit 78 I ? IO_6
+bit 77 O ? IO_6 76 0 Z
+bit 76 C 0 *
+bit 75 I ? IO_7
+bit 74 O ? IO_7 73 0 Z
+bit 73 C 0 *
+bit 72 I ? IO_8
+bit 71 O ? IO_8 70 0 Z
+bit 70 C 0 *
+bit 69 I ? IO_9
+bit 68 O ? IO_9 67 0 Z
+bit 67 C 0 *
+bit 66 I ? IO_10
+bit 65 O ? IO_10 64 0 Z
+bit 64 C 0 *
+bit 63 I ? IO_11
+bit 62 O ? IO_11 61 0 Z
+bit 61 C 0 *
+bit 60 I ? IO_12
+bit 59 O ? IO_12 58 0 Z
+bit 58 C 0 *
+bit 57 I ? IO_13
+bit 56 O ? IO_13 55 0 Z
+bit 55 C 0 *
+bit 54 I ? IO_14
+bit 53 O ? IO_14 52 0 Z
+bit 52 C 0 *
+bit 51 I ? IO_15
+bit 50 O ? IO_15 49 0 Z
+bit 49 C 0 *
+bit 48 I ? IO_16
+bit 47 O ? IO_16 46 0 Z
+bit 46 C 0 *
+bit 45 I ? IO_17
+bit 44 O ? IO_17 43 0 Z
+bit 43 C 0 *
+bit 42 I ? IO_18
+bit 41 O ? IO_18 40 0 Z
+bit 40 C 0 *
+bit 39 I ? IO_19
+bit 38 O ? IO_19 37 0 Z
+bit 37 C 0 *
+bit 36 I ? IO_20
+bit 35 O ? IO_20 34 0 Z
+bit 34 C 0 *
+bit 33 I ? IO_21
+bit 32 O ? IO_21 31 0 Z
+bit 31 C 0 *
+bit 30 I ? IO_22
+bit 29 O ? IO_22 28 0 Z
+bit 28 C 0 *
+bit 27 I ? IO_23
+bit 26 O ? IO_23 25 0 Z
+bit 25 C 0 *
+bit 24 I ? IO_24
+bit 23 O ? IO_24 22 0 Z
+bit 22 C 0 *
+bit 21 I ? IO_25
+bit 20 O ? IO_25 19 0 Z
+bit 19 C 0 *
+bit 18 I ? IO_26
+bit 17 O ? IO_26 16 0 Z
+bit 16 C 0 *
+bit 15 I ? IO_27
+bit 14 O ? IO_27 13 0 Z
+bit 13 C 0 *
+bit 12 I ? IO_28
+bit 11 O ? IO_28 10 0 Z
+bit 10 C 0 *
+bit 9 I ? IO_29
+bit 8 O ? IO_29 7 0 Z
+bit 7 C 0 *
+bit 6 I ? IO_30
+bit 5 O ? IO_30 4 0 Z
+bit 4 C 0 *
+bit 3 I ? IO_31
+bit 2 O ? IO_31 1 0 Z
+bit 1 C 0 *
+bit 0 I ? IN_32