diff --git a/library/atmel.dcm b/library/atmel.dcm
index 5a40fbe1..ee031f3c 100644
--- a/library/atmel.dcm
+++ b/library/atmel.dcm
@@ -49,13 +49,37 @@ F http://www.atmel.com/Images/doc3390.pdf
 $ENDCMP
 #
 $CMP AT90CAN128-A
-D AT90CAN128-A, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, QFN64
+D AT90CAN128-A, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, TQFP64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN128-M
-D AT90CAN128-M, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, TQFP64
+D AT90CAN128-M, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, QFN64
+K AVR 8bit Microcontroller MegaAVR
+F http://www.atmel.com/Images/doc7679.pdf
+$ENDCMP
+#
+$CMP AT90CAN32-A
+D AT90CAN32-A, 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, TQFP64
+K AVR 8bit Microcontroller MegaAVR
+F http://www.atmel.com/Images/doc7679.pdf
+$ENDCMP
+#
+$CMP AT90CAN32-M
+D AT90CAN32-M, 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, QFN64
+K AVR 8bit Microcontroller MegaAVR
+F http://www.atmel.com/Images/doc7679.pdf
+$ENDCMP
+#
+$CMP AT90CAN64-A
+D AT90CAN64-A, 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, TQFP64
+K AVR 8bit Microcontroller MegaAVR
+F http://www.atmel.com/Images/doc7679.pdf
+$ENDCMP
+#
+$CMP AT90CAN64-M
+D AT90CAN64-M, 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, QFN64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
diff --git a/library/atmel.lib b/library/atmel.lib
index 147335df..d84e735d 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -138,10 +138,11 @@ ENDDEF
 DEF AT90CAN128-A U 0 40 Y Y 1 F N
 F0 "U" -1150 1900 50 H V L BNN
 F1 "AT90CAN128-A" 1150 -1950 50 H V R BNN
-F2 "QFN64" 50 0 50 H V C CNN
+F2 "TQFP64" 50 0 50 H V C CNN
 F3 "" 0 0 60 H V C CNN
+ALIAS AT90CAN64-A AT90CAN32-A
 $FPLIST
- QFN64
+ TQFP64
 $ENDFPLIST
 DRAW
 S -1150 1850 1150 -1850 0 1 10 f
@@ -216,10 +217,11 @@ ENDDEF
 DEF AT90CAN128-M U 0 40 Y Y 1 F N
 F0 "U" -1150 1900 50 H V L BNN
 F1 "AT90CAN128-M" 1100 -1950 50 H V R BNN
-F2 "TQFP64" 50 0 50 H V C CNN
+F2 "QFN64" 50 0 50 H V C CNN
 F3 "" 0 0 60 H V C CNN
+ALIAS AT90CAN64-M AT90CAN32-M
 $FPLIST
- TQFP64
+ QFN64
 $ENDFPLIST
 DRAW
 S -1150 1850 1150 -1850 0 1 10 f