diff --git a/library/msp430.dcm b/library/msp430.dcm
index 8d9b88c7..088d4447 100644
--- a/library/msp430.dcm
+++ b/library/msp430.dcm
@@ -1,5 +1,59 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP MSP430AFE221IPW
+D MSP430AFE221, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE222IPW
+D MSP430AFE222, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE223IPW
+D MSP430AFE223, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE231IPW
+D MSP430AFE231, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE232IPW
+D MSP430AFE232, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE233IPW
+D MSP430AFE233, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE251IPW
+D MSP430AFE251, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE252IPW
+D MSP430AFE252, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
+$CMP MSP430AFE253IPW
+D MSP430AFE253, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+K MSP430 MIXED SIGNAL MICROCONTROLLER
+F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
+$ENDCMP
+#
 $CMP MSP430F2001IN
 D MSP430F2001, 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
diff --git a/library/msp430.lib b/library/msp430.lib
index dc22df9f..3194165c 100644
--- a/library/msp430.lib
+++ b/library/msp430.lib
@@ -1,6 +1,117 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+# MSP430AFE221IPW
+#
+DEF MSP430AFE221IPW U 0 40 Y Y 1 F N
+F0 "U" -900 750 40 H V C CNN
+F1 "MSP430AFE221IPW" 600 -750 40 H V C CNN
+F2 "24PW" -850 -750 35 H V C CIN
+F3 "" 0 0 60 H V C CNN
+ALIAS MSP430AFE231IPW MSP430AFE251IPW
+DRAW
+S -950 700 850 -700 0 1 10 f
+X A0.0+ 1 -1100 350 150 R 40 40 1 1 P
+X A0.0- 2 -1100 250 150 R 40 40 1 1 P
+X (AVSS) 3 -1100 50 150 R 40 40 1 1 P
+X (AVSS) 4 -1100 -50 150 R 40 40 1 1 P
+X AVCC 5 -200 850 150 D 40 40 1 1 W
+X AVSS 6 -200 -850 150 U 40 40 1 1 W
+X Vref 7 -1100 -600 150 R 40 40 1 1 P
+X (AVSS) 8 -1100 -250 150 R 40 40 1 1 P
+X (AVSS) 9 -1100 -350 150 R 40 40 1 1 P
+X SBWTCK/TEST 10 1000 600 150 L 40 40 1 1 I
+X URXD0/P1.4 20 1000 50 150 L 40 40 1 1 B
+X ~RST~/NMI/SBWTDIO 11 -1100 600 150 R 40 40 1 1 I
+X TMS/SVSOUT/SIMO0/P1.5 21 1000 -50 150 L 40 40 1 1 B
+X TA2/SMCLK/TACLK/SVSIN/P1.0 12 1000 450 150 L 40 40 1 1 B
+X TCK/TA2/SOMI0/P1.6 22 1000 -150 150 L 40 40 1 1 B
+X DVSS 13 200 -850 150 U 40 40 1 1 W
+X TDI/TDO/TA1/UCLK0/P1.7 23 1000 -250 150 L 40 40 1 1 B
+X XT2IN/P2.6 14 1000 -500 150 L 40 40 1 1 B
+X TCLK/TDI/TA0/STE0/P2.0 24 1000 -400 150 L 40 40 1 1 B
+X XT2OUT/P2.7 15 1000 -600 150 L 40 40 1 1 B
+X DVCC 16 200 850 150 D 40 40 1 1 W
+X SDCLK/TA1/P1.1 17 1000 350 150 L 40 40 1 1 B
+X SD0DO/TA0/P1.2 18 1000 250 150 L 40 40 1 1 B
+X UTXD0/P1.3 19 1000 150 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MSP430AFE222IPW
+#
+DEF MSP430AFE222IPW U 0 40 Y Y 1 F N
+F0 "U" -900 750 40 H V C CNN
+F1 "MSP430AFE222IPW" 600 -750 40 H V C CNN
+F2 "24PW" -850 -750 35 H V C CIN
+F3 "" 0 0 60 H V C CNN
+ALIAS MSP430AFE232IPW MSP430AFE252IPW
+DRAW
+S -950 700 850 -700 0 1 10 f
+X A0.0+ 1 -1100 350 150 R 40 40 1 1 P
+X A0.0- 2 -1100 250 150 R 40 40 1 1 P
+X A1.0+ 3 -1100 50 150 R 40 40 1 1 P
+X A1.0- 4 -1100 -50 150 R 40 40 1 1 P
+X AVCC 5 -200 850 150 D 40 40 1 1 W
+X AVSS 6 -200 -850 150 U 40 40 1 1 W
+X Vref 7 -1100 -600 150 R 40 40 1 1 P
+X (AVSS) 8 -1100 -250 150 R 40 40 1 1 P
+X (AVSS) 9 -1100 -350 150 R 40 40 1 1 P
+X SBWTCK/TEST 10 1000 600 150 L 40 40 1 1 I
+X URXD0/P1.4 20 1000 50 150 L 40 40 1 1 B
+X ~RST~/NMI/SBWTDIO 11 -1100 600 150 R 40 40 1 1 I
+X TMS/SVSOUT/SIMO0/P1.5 21 1000 -50 150 L 40 40 1 1 B
+X TA2/SMCLK/TACLK/SVSIN/P1.0 12 1000 450 150 L 40 40 1 1 B
+X TCK/TA2/SOMI0/P1.6 22 1000 -150 150 L 40 40 1 1 B
+X DVSS 13 200 -850 150 U 40 40 1 1 W
+X TDI/TDO/TA1/UCLK0/P1.7 23 1000 -250 150 L 40 40 1 1 B
+X XT2IN/P2.6 14 1000 -500 150 L 40 40 1 1 B
+X TCLK/TDI/TA0/STE0/P2.0 24 1000 -400 150 L 40 40 1 1 B
+X XT2OUT/P2.7 15 1000 -600 150 L 40 40 1 1 B
+X DVCC 16 200 850 150 D 40 40 1 1 W
+X SDCLK/TA1/P1.1 17 1000 350 150 L 40 40 1 1 B
+X SD0DO/TA0/P1.2 18 1000 250 150 L 40 40 1 1 B
+X SD1DO/UTXD0/P1.3 19 1000 150 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MSP430AFE223IPW
+#
+DEF MSP430AFE223IPW U 0 40 Y Y 1 F N
+F0 "U" -900 750 40 H V C CNN
+F1 "MSP430AFE223IPW" 600 -750 40 H V C CNN
+F2 "24PW" -850 -750 35 H V C CIN
+F3 "" 0 0 60 H V C CNN
+ALIAS MSP430AFE233IPW MSP430AFE253IPW
+DRAW
+S -950 700 850 -700 0 1 10 f
+X A0.0+ 1 -1100 350 150 R 40 40 1 1 P
+X A0.0- 2 -1100 250 150 R 40 40 1 1 P
+X A1.0+ 3 -1100 50 150 R 40 40 1 1 P
+X A1.0- 4 -1100 -50 150 R 40 40 1 1 P
+X AVCC 5 -200 850 150 D 40 40 1 1 W
+X AVSS 6 -200 -850 150 U 40 40 1 1 W
+X Vref 7 -1100 -600 150 R 40 40 1 1 P
+X A2.0+ 8 -1100 -250 150 R 40 40 1 1 P
+X A2.0- 9 -1100 -350 150 R 40 40 1 1 P
+X SBWTCK/TEST 10 1000 600 150 L 40 40 1 1 I
+X SD2DO/URXD0/P1.4 20 1000 50 150 L 40 40 1 1 B
+X ~RST~/NMI/SBWTDIO 11 -1100 600 150 R 40 40 1 1 I
+X TMS/SVSOUT/SIMO0/P1.5 21 1000 -50 150 L 40 40 1 1 B
+X TA2/SMCLK/TACLK/SVSIN/P1.0 12 1000 450 150 L 40 40 1 1 B
+X TCK/TA2/SOMI0/P1.6 22 1000 -150 150 L 40 40 1 1 B
+X DVSS 13 200 -850 150 U 40 40 1 1 W
+X TDI/TDO/TA1/UCLK0/P1.7 23 1000 -250 150 L 40 40 1 1 B
+X XT2IN/P2.6 14 1000 -500 150 L 40 40 1 1 B
+X TCLK/TDI/TA0/STE0/P2.0 24 1000 -400 150 L 40 40 1 1 B
+X XT2OUT/P2.7 15 1000 -600 150 L 40 40 1 1 B
+X DVCC 16 200 850 150 D 40 40 1 1 W
+X SDCLK/TA1/P1.1 17 1000 350 150 L 40 40 1 1 B
+X SD0DO/TA0/P1.2 18 1000 250 150 L 40 40 1 1 B
+X SD1DO/UTXD0/P1.3 19 1000 150 150 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
 # MSP430F2001IN
 #
 DEF MSP430F2001IN U 0 40 Y Y 1 F N