diff --git a/library/microchip.dcm b/library/microchip.dcm
index 78917ff2..3e6c9281 100644
--- a/library/microchip.dcm
+++ b/library/microchip.dcm
@@ -1,27 +1,27 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP ENC28J60-C/SS
-D ENC28J60 Single Chip Ethernet Interface, SSOP-28
+$CMP ENC28J60x-ML
+D ENC28J60 Single Chip Ethernet Interface,QFN
 K ENC Ethernet
-F http://ww1.microchip.com/downloads/en/devicedoc/39662a.pdf
+F http://ww1.microchip.com/downloads/en/devicedoc/39662e.pdf
 $ENDCMP
 #
-$CMP ENC28J60-I/ML
-D ENC28J60 Single Chip Ethernet Interface, QFN-28+EP
+$CMP ENC28J60x-SO
+D ENC28J60 Single Chip Ethernet Interface,SOIC
 K ENC Ethernet
-F http://ww1.microchip.com/downloads/en/devicedoc/39662a.pdf
+F http://ww1.microchip.com/downloads/en/devicedoc/39662e.pdf
 $ENDCMP
 #
-$CMP ENC28J60-I/SO
-D ENC28J60 Single Chip Ethernet Interface, SOIC-28
+$CMP ENC28J60x-SP
+D ENC28J60 Single Chip Ethernet Interface,SPDIP
 K ENC Ethernet
-F http://ww1.microchip.com/downloads/en/devicedoc/39662a.pdf
+F http://ww1.microchip.com/downloads/en/devicedoc/39662e.pdf
 $ENDCMP
 #
-$CMP ENC28J60-I/SP
-D ENC28J60 Single Chip Ethernet Interface, PDIP-28
+$CMP ENC28J60x-SS
+D ENC28J60 Single Chip Ethernet Interface,SSOP
 K ENC Ethernet
-F http://ww1.microchip.com/downloads/en/devicedoc/39662a.pdf
+F http://ww1.microchip.com/downloads/en/devicedoc/39662e.pdf
 $ENDCMP
 #
 $CMP KSZ9031RNXCA
diff --git a/library/microchip.lib b/library/microchip.lib
index 5a43bc7b..cebb7d52 100644
--- a/library/microchip.lib
+++ b/library/microchip.lib
@@ -1,176 +1,175 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# ENC28J60-C/SS
+# ENC28J60x-ML
 #
-DEF ENC28J60-C/SS U 0 40 Y Y 1 F N
+DEF ENC28J60x-ML U 0 40 Y Y 1 F N
 F0 "U" -550 950 50 H V L CNN
-F1 "ENC28J60-C/SS" 200 950 50 H V L CNN
-F2 "SSOP-28" 0 0 50 H I C CIN
+F1 "ENC28J60x-ML" 200 950 50 H V L CNN
+F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 1200 -950 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SSOP*
+ QFN*28*1EP*6x6mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
-S -550 900 550 -900 0 1 10 f
-X VCAP 1 700 -800 150 L 50 50 1 1 I
-X VSS 2 -100 -1050 150 U 50 50 1 1 W
-X CLKOUT 3 -700 -800 150 R 50 50 1 1 O
-X ~INT 4 -700 100 150 R 50 50 1 1 O
-X ~WOL 5 -700 0 150 R 50 50 1 1 O
-X SO 6 -700 500 150 R 50 50 1 1 O
-X SI 7 -700 600 150 R 50 50 1 1 I
-X SCK 8 -700 400 150 R 50 50 1 1 I
-X ~CS 9 -700 300 150 R 50 50 1 1 I
-X ~RESET 10 -700 800 150 R 50 50 1 1 I
-X VDDPLL 20 100 1050 150 D 50 50 1 1 W
-X VSSRX 11 700 200 150 L 50 50 1 1 W
-X VSSPLL 21 100 -1050 150 U 50 50 1 1 W
-X TPIN- 12 700 300 150 L 50 50 1 1 I
-X VSSOSC 22 -700 -600 150 R 50 50 1 1 W
-X TPIN+ 13 700 400 150 L 50 50 1 1 I
-X OSC1 23 -700 -300 150 R 50 50 1 1 I
-X RBIAS 14 700 -600 150 L 50 50 1 1 I
-X OSC2 24 -700 -500 150 R 50 50 1 1 I
-X VDDTX 15 700 0 150 L 50 50 1 1 W
-X VDDOSC 25 -700 -200 150 R 50 50 1 1 W
-X TPOUT- 16 700 -200 150 L 50 50 1 1 O
-X LEDB 26 700 700 150 L 50 50 1 1 O
-X TPOUT+ 17 700 -100 150 L 50 50 1 1 O
-X LEDA 27 700 800 150 L 50 50 1 1 O
-X VSSTX 18 700 -300 150 L 50 50 1 1 W
-X VDD 28 -100 1050 150 D 50 50 1 1 W
-X VDDRX 19 700 500 150 L 50 50 1 1 W
+S -600 900 600 -900 0 1 10 f
+X ~WOL 1 -700 0 100 R 50 50 1 1 O
+X SO 2 -700 500 100 R 50 50 1 1 O
+X SI 3 -700 600 100 R 50 50 1 1 I
+X SCK 4 -700 400 100 R 50 50 1 1 I
+X ~CS 5 -700 300 100 R 50 50 1 1 I
+X ~RESET 6 -700 800 100 R 50 50 1 1 I
+X VSSRX 7 700 200 100 L 50 50 1 1 w
+X TPIN- 8 700 300 100 L 50 50 1 1 I
+X TPIN+ 9 700 400 100 L 50 50 1 1 I
+X RBIAS 10 700 -600 100 L 50 50 1 1 I
+X OSC2 20 -700 -500 100 R 50 50 1 1 O
+X VDDTX 11 700 0 100 L 50 50 1 1 W
+X VDDOSC 21 -700 -200 100 R 50 50 1 1 W
+X TPOUT- 12 700 -200 100 L 50 50 1 1 O
+X LEDB 22 700 700 100 L 50 50 1 1 O
+X TPOUT+ 13 700 -100 100 L 50 50 1 1 O
+X LEDA 23 700 800 100 L 50 50 1 1 O
+X VSSTX 14 700 -300 100 L 50 50 1 1 w
+X VDD 24 -100 1000 100 D 50 50 1 1 W
+X VDDRX 15 700 500 100 L 50 50 1 1 W
+X VCAP 25 700 -800 100 L 50 50 1 1 I
+X VDDPLL 16 100 1000 100 D 50 50 1 1 W
+X VSS 26 -100 -1000 100 U 50 50 1 1 W
+X VSSPLL 17 100 -1000 100 U 50 50 1 1 W
+X CLKOUT 27 -700 -800 100 R 50 50 1 1 O
+X VSSOSC 18 -700 -600 100 R 50 50 1 1 W
+X ~INT 28 -700 100 100 R 50 50 1 1 O
+X OSC1 19 -700 -300 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ENC28J60-I/ML
+# ENC28J60x-SO
 #
-DEF ENC28J60-I/ML U 0 40 Y Y 1 F N
+DEF ENC28J60x-SO U 0 40 Y Y 1 F N
 F0 "U" -550 950 50 H V L CNN
-F1 "ENC28J60-I/ML" 200 950 50 H V L CNN
-F2 "QFN-28" 0 0 50 H I C CIN
+F1 "ENC28J60x-SO" 200 950 50 H V L CNN
+F2 "Housings_SOIC:SOIC-28W_7.5x17.9mm_Pitch1.27mm" 1150 -950 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- QFP*
+ SOIC*28*7.5x17.9mm*Pitch1.27mm*
 $ENDFPLIST
 DRAW
-S -550 900 550 -900 0 1 10 f
-X ~WOL 1 -700 0 150 R 50 50 1 1 O
-X SO 2 -700 500 150 R 50 50 1 1 O
-X SI 3 -700 600 150 R 50 50 1 1 I
-X SCK 4 -700 400 150 R 50 50 1 1 I
-X ~CS 5 -700 300 150 R 50 50 1 1 I
-X ~RESET 6 -700 800 150 R 50 50 1 1 I
-X VSSRX 7 700 200 150 L 50 50 1 1 w
-X TPIN- 8 700 300 150 L 50 50 1 1 I
-X TPIN+ 9 700 400 150 L 50 50 1 1 I
-X RBIAS 10 700 -600 150 L 50 50 1 1 I
-X OSC2 20 -700 -500 150 R 50 50 1 1 O
-X VDDTX 11 700 0 150 L 50 50 1 1 W
-X VDDOSC 21 -700 -200 150 R 50 50 1 1 W
-X TPOUT- 12 700 -200 150 L 50 50 1 1 O
-X LEDB 22 700 700 150 L 50 50 1 1 O
-X TPOUT+ 13 700 -100 150 L 50 50 1 1 O
-X LEDA 23 700 800 150 L 50 50 1 1 O
-X VSSTX 14 700 -300 150 L 50 50 1 1 w
-X VDD 24 -100 1050 150 D 50 50 1 1 W
-X VDDRX 15 700 500 150 L 50 50 1 1 W
-X VCAP 25 700 -800 150 L 50 50 1 1 I
-X VDDPLL 16 100 1050 150 D 50 50 1 1 W
-X VSS 26 -100 -1050 150 U 50 50 1 1 W
-X VSSPLL 17 100 -1050 150 U 50 50 1 1 W
-X CLKOUT 27 -700 -800 150 R 50 50 1 1 O
-X VSSOSC 18 -700 -600 150 R 50 50 1 1 W
-X ~INT 28 -700 100 150 R 50 50 1 1 O
-X OSC1 19 -700 -300 150 R 50 50 1 1 I
+S -600 900 600 -900 0 1 10 f
+X VCAP 1 700 -800 100 L 50 50 1 1 I
+X VSS 2 -100 -1000 100 U 50 50 1 1 W
+X CLKOUT 3 -700 -800 100 R 50 50 1 1 O
+X ~INT 4 -700 100 100 R 50 50 1 1 O
+X ~WOL 5 -700 0 100 R 50 50 1 1 O
+X SO 6 -700 500 100 R 50 50 1 1 O
+X SI 7 -700 600 100 R 50 50 1 1 I
+X SCK 8 -700 400 100 R 50 50 1 1 I
+X ~CS 9 -700 300 100 R 50 50 1 1 I
+X ~RESET 10 -700 800 100 R 50 50 1 1 I
+X VDDPLL 20 100 1000 100 D 50 50 1 1 W
+X VSSRX 11 700 200 100 L 50 50 1 1 W
+X VSSPLL 21 100 -1000 100 U 50 50 1 1 W
+X TPIN- 12 700 300 100 L 50 50 1 1 I
+X VSSOSC 22 -700 -600 100 R 50 50 1 1 W
+X TPIN+ 13 700 400 100 L 50 50 1 1 I
+X OSC1 23 -700 -300 100 R 50 50 1 1 I
+X RBIAS 14 700 -600 100 L 50 50 1 1 I
+X OSC2 24 -700 -500 100 R 50 50 1 1 I
+X VDDTX 15 700 0 100 L 50 50 1 1 W
+X VDDOSC 25 -700 -200 100 R 50 50 1 1 W
+X TPOUT- 16 700 -200 100 L 50 50 1 1 O
+X LEDB 26 700 700 100 L 50 50 1 1 O
+X TPOUT+ 17 700 -100 100 L 50 50 1 1 O
+X LEDA 27 700 800 100 L 50 50 1 1 O
+X VSSTX 18 700 -300 100 L 50 50 1 1 W
+X VDD 28 -100 1000 100 D 50 50 1 1 W
+X VDDRX 19 700 500 100 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ENC28J60-I/SO
+# ENC28J60x-SP
 #
-DEF ENC28J60-I/SO U 0 40 Y Y 1 F N
+DEF ENC28J60x-SP U 0 40 Y Y 1 F N
 F0 "U" -550 950 50 H V L CNN
-F1 "ENC28J60-I/SO" 200 950 50 H V L CNN
-F2 "SOIC-28" 0 0 50 H I C CIN
+F1 "ENC28J60x-SP" 200 950 50 H V L CNN
+F2 "Housings_DIP:DIP-28_W7.62mm" 750 -950 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOIC*
+ DIP*28*W7.62mm*
 $ENDFPLIST
 DRAW
-S -550 900 550 -900 0 1 10 f
-X VCAP 1 700 -800 150 L 50 50 1 1 I
-X VSS 2 -100 -1050 150 U 50 50 1 1 W
-X CLKOUT 3 -700 -800 150 R 50 50 1 1 O
-X ~INT 4 -700 100 150 R 50 50 1 1 O
-X ~WOL 5 -700 0 150 R 50 50 1 1 O
-X SO 6 -700 500 150 R 50 50 1 1 O
-X SI 7 -700 600 150 R 50 50 1 1 I
-X SCK 8 -700 400 150 R 50 50 1 1 I
-X ~CS 9 -700 300 150 R 50 50 1 1 I
-X ~RESET 10 -700 800 150 R 50 50 1 1 I
-X VDDPLL 20 100 1050 150 D 50 50 1 1 W
-X VSSRX 11 700 200 150 L 50 50 1 1 W
-X VSSPLL 21 100 -1050 150 U 50 50 1 1 W
-X TPIN- 12 700 300 150 L 50 50 1 1 I
-X VSSOSC 22 -700 -600 150 R 50 50 1 1 W
-X TPIN+ 13 700 400 150 L 50 50 1 1 I
-X OSC1 23 -700 -300 150 R 50 50 1 1 I
-X RBIAS 14 700 -600 150 L 50 50 1 1 I
-X OSC2 24 -700 -500 150 R 50 50 1 1 I
-X VDDTX 15 700 0 150 L 50 50 1 1 W
-X VDDOSC 25 -700 -200 150 R 50 50 1 1 W
-X TPOUT- 16 700 -200 150 L 50 50 1 1 O
-X LEDB 26 700 700 150 L 50 50 1 1 O
-X TPOUT+ 17 700 -100 150 L 50 50 1 1 O
-X LEDA 27 700 800 150 L 50 50 1 1 O
-X VSSTX 18 700 -300 150 L 50 50 1 1 W
-X VDD 28 -100 1050 150 D 50 50 1 1 W
-X VDDRX 19 700 500 150 L 50 50 1 1 W
+S -600 900 600 -900 0 1 10 f
+X VCAP 1 700 -800 100 L 50 50 1 1 I
+X VSS 2 -100 -1000 100 U 50 50 1 1 W
+X CLKOUT 3 -700 -800 100 R 50 50 1 1 O
+X ~INT 4 -700 100 100 R 50 50 1 1 O
+X ~WOL 5 -700 0 100 R 50 50 1 1 O
+X SO 6 -700 500 100 R 50 50 1 1 O
+X SI 7 -700 600 100 R 50 50 1 1 I
+X SCK 8 -700 400 100 R 50 50 1 1 I
+X ~CS 9 -700 300 100 R 50 50 1 1 I
+X ~RESET 10 -700 800 100 R 50 50 1 1 I
+X VDDPLL 20 100 1000 100 D 50 50 1 1 W
+X VSSRX 11 700 200 100 L 50 50 1 1 W
+X VSSPLL 21 100 -1000 100 U 50 50 1 1 W
+X TPIN- 12 700 300 100 L 50 50 1 1 I
+X VSSOSC 22 -700 -600 100 R 50 50 1 1 W
+X TPIN+ 13 700 400 100 L 50 50 1 1 I
+X OSC1 23 -700 -300 100 R 50 50 1 1 I
+X RBIAS 14 700 -600 100 L 50 50 1 1 I
+X OSC2 24 -700 -500 100 R 50 50 1 1 I
+X VDDTX 15 700 0 100 L 50 50 1 1 W
+X VDDOSC 25 -700 -200 100 R 50 50 1 1 W
+X TPOUT- 16 700 -200 100 L 50 50 1 1 O
+X LEDB 26 700 700 100 L 50 50 1 1 O
+X TPOUT+ 17 700 -100 100 L 50 50 1 1 O
+X LEDA 27 700 800 100 L 50 50 1 1 O
+X VSSTX 18 700 -300 100 L 50 50 1 1 W
+X VDD 28 -100 1000 100 D 50 50 1 1 W
+X VDDRX 19 700 500 100 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ENC28J60-I/SP
+# ENC28J60x-SS
 #
-DEF ENC28J60-I/SP U 0 40 Y Y 1 F N
+DEF ENC28J60x-SS U 0 40 Y Y 1 F N
 F0 "U" -550 950 50 H V L CNN
-F1 "ENC28J60-I/SP" 200 950 50 H V L CNN
-F2 "DIP-28" 0 0 50 H I C CIN
+F1 "ENC28J60x-SS" 200 950 50 H V L CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 1150 -950 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- DIP*
- PDIP*
+ SSOP*28*5.3x10.2mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
-S -550 900 550 -900 0 1 10 f
-X VCAP 1 700 -800 150 L 50 50 1 1 I
-X VSS 2 -100 -1050 150 U 50 50 1 1 W
-X CLKOUT 3 -700 -800 150 R 50 50 1 1 O
-X ~INT 4 -700 100 150 R 50 50 1 1 O
-X ~WOL 5 -700 0 150 R 50 50 1 1 O
-X SO 6 -700 500 150 R 50 50 1 1 O
-X SI 7 -700 600 150 R 50 50 1 1 I
-X SCK 8 -700 400 150 R 50 50 1 1 I
-X ~CS 9 -700 300 150 R 50 50 1 1 I
-X ~RESET 10 -700 800 150 R 50 50 1 1 I
-X VDDPLL 20 100 1050 150 D 50 50 1 1 W
-X VSSRX 11 700 200 150 L 50 50 1 1 W
-X VSSPLL 21 100 -1050 150 U 50 50 1 1 W
-X TPIN- 12 700 300 150 L 50 50 1 1 I
-X VSSOSC 22 -700 -600 150 R 50 50 1 1 W
-X TPIN+ 13 700 400 150 L 50 50 1 1 I
-X OSC1 23 -700 -300 150 R 50 50 1 1 I
-X RBIAS 14 700 -600 150 L 50 50 1 1 I
-X OSC2 24 -700 -500 150 R 50 50 1 1 I
-X VDDTX 15 700 0 150 L 50 50 1 1 W
-X VDDOSC 25 -700 -200 150 R 50 50 1 1 W
-X TPOUT- 16 700 -200 150 L 50 50 1 1 O
-X LEDB 26 700 700 150 L 50 50 1 1 O
-X TPOUT+ 17 700 -100 150 L 50 50 1 1 O
-X LEDA 27 700 800 150 L 50 50 1 1 O
-X VSSTX 18 700 -300 150 L 50 50 1 1 W
-X VDD 28 -100 1050 150 D 50 50 1 1 W
-X VDDRX 19 700 500 150 L 50 50 1 1 W
+S -600 900 600 -900 0 1 10 f
+X VCAP 1 700 -800 100 L 50 50 1 1 I
+X VSS 2 -100 -1000 100 U 50 50 1 1 W
+X CLKOUT 3 -700 -800 100 R 50 50 1 1 O
+X ~INT 4 -700 100 100 R 50 50 1 1 O
+X ~WOL 5 -700 0 100 R 50 50 1 1 O
+X SO 6 -700 500 100 R 50 50 1 1 O
+X SI 7 -700 600 100 R 50 50 1 1 I
+X SCK 8 -700 400 100 R 50 50 1 1 I
+X ~CS 9 -700 300 100 R 50 50 1 1 I
+X ~RESET 10 -700 800 100 R 50 50 1 1 I
+X VDDPLL 20 100 1000 100 D 50 50 1 1 W
+X VSSRX 11 700 200 100 L 50 50 1 1 W
+X VSSPLL 21 100 -1000 100 U 50 50 1 1 W
+X TPIN- 12 700 300 100 L 50 50 1 1 I
+X VSSOSC 22 -700 -600 100 R 50 50 1 1 W
+X TPIN+ 13 700 400 100 L 50 50 1 1 I
+X OSC1 23 -700 -300 100 R 50 50 1 1 I
+X RBIAS 14 700 -600 100 L 50 50 1 1 I
+X OSC2 24 -700 -500 100 R 50 50 1 1 I
+X VDDTX 15 700 0 100 L 50 50 1 1 W
+X VDDOSC 25 -700 -200 100 R 50 50 1 1 W
+X TPOUT- 16 700 -200 100 L 50 50 1 1 O
+X LEDB 26 700 700 100 L 50 50 1 1 O
+X TPOUT+ 17 700 -100 100 L 50 50 1 1 O
+X LEDA 27 700 800 100 L 50 50 1 1 O
+X VSSTX 18 700 -300 100 L 50 50 1 1 W
+X VDD 28 -100 1000 100 D 50 50 1 1 W
+X VDDRX 19 700 500 100 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #