diff --git a/library/xilinx.dcm b/library/xilinx.dcm
index ef97eeae..0cfc191a 100644
--- a/library/xilinx.dcm
+++ b/library/xilinx.dcm
@@ -4,11 +4,6 @@ $CMP XC18V01SO20
 F xilinx/xc18v00proms.pdf
 $ENDCMP
 #
-$CMP XC2S64A-xQFG48
-D Xilinx CoolRunner
-F xilinx/xc2c64.pdf
-$ENDCMP
-#
 $CMP XC2S100TQ144
 D spartan 2
 K FPGA
@@ -29,6 +24,11 @@ $CMP XC2S300PQ208
 F xilinx/spartan2e/spartan2e.pdf
 $ENDCMP
 #
+$CMP XC2S64A-xQFG48
+D Xilinx CoolRunner
+F xilinx/xc2c64.pdf
+$ENDCMP
+#
 $CMP XC3S200AN/FT256
 D BGA256/1mm
 $ENDCMP
diff --git a/library/xilinx.lib b/library/xilinx.lib
index a3caf070..9d021b31 100644
--- a/library/xilinx.lib
+++ b/library/xilinx.lib
@@ -6261,20 +6261,22 @@ ENDDEF
 # XC9572XL-TQ100
 #
 DEF XC9572XL-TQ100 U 0 30 Y Y 1 F N
-F0 "U" 850 2650 50 H V C CNN
-F1 "XC9572XL-TQ100" 0 0 50 H V C CNN
-F2 "TQFP-100_14x14mm_Pitch0.5mm" 0 100 50 H V C CNN
+F0 "U" -850 2650 50 H V C CNN
+F1 "XC9572XL-TQ100" 700 -2650 50 H V C CNN
+F2 "Housings_QFP:TQFP-100_14x14mm_Pitch0.5mm" 0 100 50 H I C CNN
 F3 "" -50 50 50 H V C CNN
 $FPLIST
- TQFP-100_14x14mm_Pitch0.5mm
+ TQFP*14x14mm*Pitch0.5mm*
 $ENDFPLIST
 DRAW
-S -900 -2600 900 2600 0 1 10 N
+S -900 -2600 900 2600 0 1 10 f
 X I/O/GTS3 1 -1200 -100 300 R 50 50 1 1 B
+X NC 2 -900 2500 0 R 50 50 1 1 N N
 X I/O/GTS1 3 -1200 -200 300 R 50 50 1 1 B
 X I/O/GTS2 4 -1200 -300 300 R 50 50 1 1 B
 X VCC 5 -400 2900 300 D 50 50 1 1 W
 X P6 6 -1200 -400 300 R 50 50 1 1 B
+X NC 7 -900 2400 0 R 50 50 1 1 N N
 X P8 8 -1200 -500 300 R 50 50 1 1 B
 X P9 9 -1200 -600 300 R 50 50 1 1 B
 X P10 10 -1200 -700 300 R 50 50 1 1 B
@@ -6284,6 +6286,7 @@ X P40 40 -1200 100 300 R 50 50 1 1 B
 X P50 50 1200 1200 300 L 50 50 1 1 B
 X P60 60 1200 400 300 L 50 50 1 1 B
 X P70 70 1200 -500 300 L 50 50 1 1 B
+X NC 80 900 2300 0 L 50 50 1 1 N N
 X P90 90 1200 -1800 300 L 50 50 1 1 B
 X P11 11 -1200 -800 300 R 50 50 1 1 B
 X GND 21 -400 -2900 300 U 50 50 1 1 W
@@ -6306,11 +6309,15 @@ X P92 92 -1200 -1200 300 R 50 50 1 1 B
 X P13 13 -1200 1800 300 R 50 50 1 1 B
 X I/O/GCK2 23 -1200 1000 300 R 50 50 1 1 B
 X P33 33 -1200 400 300 R 50 50 1 1 B
+X NC 43 -900 2000 0 R 50 50 1 1 N N
 X P53 53 1200 1000 300 L 50 50 1 1 B
 X P63 63 1200 200 300 L 50 50 1 1 B
+X NC 73 900 2400 0 L 50 50 1 1 N N
 X TDO 83 1200 -2400 300 L 50 50 1 1 O
 X P93 93 -1200 -1300 300 R 50 50 1 1 B
 X P14 14 -1200 1700 300 R 50 50 1 1 B
+X NC 24 -900 2200 0 R 50 50 1 1 N N
+X NC 34 -900 2100 0 R 50 50 1 1 N N
 X GND 44 -200 -2900 300 U 50 50 1 1 W
 X P54 54 1200 900 300 L 50 50 1 1 B
 X P64 64 1200 100 300 L 50 50 1 1 B
@@ -6329,6 +6336,7 @@ X P95 95 -1200 -1500 300 R 50 50 1 1 B
 X P16 16 -1200 1500 300 R 50 50 1 1 B
 X VCCIO 26 100 2900 300 D 50 50 1 1 W
 X P36 36 -1200 300 300 R 50 50 1 1 B
+X NC 46 900 2500 0 L 50 50 1 1 N N
 X P56 56 1200 700 300 L 50 50 1 1 B
 X P66 66 1200 -200 300 L 50 50 1 1 B
 X P76 76 1200 -900 300 L 50 50 1 1 B
@@ -6352,6 +6360,7 @@ X P68 68 1200 -400 300 L 50 50 1 1 B
 X P78 78 1200 -1100 300 L 50 50 1 1 B
 X VCCIO 88 400 2900 300 D 50 50 1 1 W
 X VCC 98 -200 2900 300 D 50 50 1 1 W
+X NC 19 -900 2300 0 R 50 50 1 1 N N
 X P29 29 -1200 600 300 R 50 50 1 1 B
 X P39 39 -1200 200 300 R 50 50 1 1 B
 X P49 49 1200 1300 300 L 50 50 1 1 B