diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e9ca3c5316..84263ae7360 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-22  Eric B. Weddington  <eweddington@cso.atmel.com>
+
+	* config/avr/avr.c (avr_mcu_types): Remove ATmega603 which was never
+	produced.
+	* config/avr/avr.h (LINK_SPEC): Likewise.
+	(CRT_BINUTILS_SPECS): Likewsie.
+	* config/avr/t-avr (MULTILIB_MATCHES): Likewise.
+
 2007-10-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR rtl-optimization/33644
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 14686462f02..7ffa4b5895c 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -194,7 +194,6 @@ static const struct mcu_type_s avr_mcu_types[] = {
     /* Classic, > 8K.  */
   { "avr3",         ARCH_AVR3, NULL },
   { "atmega103",    ARCH_AVR3, "__AVR_ATmega103__" },
-  { "atmega603",    ARCH_AVR3, "__AVR_ATmega603__" },
   { "at43usb320",   ARCH_AVR3, "__AVR_AT43USB320__" },
   { "at43usb355",   ARCH_AVR3, "__AVR_AT43USB355__" },
   { "at76c711",     ARCH_AVR3, "__AVR_AT76C711__" },
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 2796810a8a1..f529e1612de 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -758,7 +758,6 @@ mmcu=*:-mmcu=%*}"
   mmcu=attiny4*|\
   mmcu=attiny8*:-m avr2}\
 %{mmcu=atmega103|\
-  mmcu=atmega603|\
   mmcu=at43*|\
   mmcu=at76*:-m avr3}\
 %{mmcu=atmega8*|\
@@ -851,7 +850,6 @@ mmcu=*:-mmcu=%*}"
 %{mmcu=attiny43u:crttn43u.o%s} \
 %{mmcu=attiny48:crttn48.o%s} \
 %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
-%{mmcu=atmega603:crtm603.o%s} \
 %{mmcu=at43usb320:crt43320.o%s} \
 %{mmcu=at43usb355:crt43355.o%s} \
 %{mmcu=at76c711:crt76711.o%s} \
diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
index 43c80627d49..da3264ca08a 100644
--- a/gcc/config/avr/t-avr
+++ b/gcc/config/avr/t-avr
@@ -57,7 +57,6 @@ MULTILIB_MATCHES = \
 	mmcu?avr25=mmcu?attiny48 \
 	mmcu?avr25=mmcu?at86rf401 \
 	mmcu?avr3=mmcu?atmega103 \
-	mmcu?avr3=mmcu?atmega603 \
 	mmcu?avr3=mmcu?at43usb320 \
 	mmcu?avr3=mmcu?at43usb355 \
 	mmcu?avr3=mmcu?at76c711 \