diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index ee1d9fab4e43..89bb6a378706 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.3.2003.05.11
+PORTVERSION=	3.3.2003.07.07
 PORTREVISION=	0
 CATEGORIES=	devel
 #MASTER_SITES=	${MASTER_SITE_GNU}
@@ -40,7 +40,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAN_AUX=	gcc-man.2003.05.11.gz
+MAN_AUX=	gcc-man.2003.07.07.tar.gz
 
 MAKE_FLAGS=	LANGUAGES="c c++"
 # get rid of that silly -mcpu=pentiumpro -current is so fond of. :-(
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index 267dade0d043..cda63ff33131 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcc-core+g++-3.3.2003.05.11.tar.bz2) = 3d19ec297715fe9aa185856d2b8b203d
-MD5 (gcc-man.2003.05.11.gz) = 3dcf33d205597e11b34870739d3aa558
+MD5 (gcc-core+g++-3.3.2003.07.07.tar.bz2) = acbcf78e0a8609b6eecfc45ef0c10d25
+MD5 (gcc-man.2003.07.07.tar.gz) = 86dfb21a3003c86d9a5b913129cb21be
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index 4a7925ccb18d..3d29b2d011a2 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -5,7 +5,7 @@ bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/avr-gcc-3.3
+bin/avr-gcc-3.3.1
 bin/avr-gccbug
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
@@ -20,42 +20,42 @@ info/gccint.info
 @exec install-info %D/info/gccint.info %D/info/dir
 @exec install-info %D/info/cppinternals.info %D/info/dir
 lib/charset.alias
-lib/gcc-lib/avr/3.3/avr3/libgcc.a
-lib/gcc-lib/avr/3.3/avr4/libgcc.a
-lib/gcc-lib/avr/3.3/avr5/libgcc.a
-lib/gcc-lib/avr/3.3/cc1
-lib/gcc-lib/avr/3.3/cc1plus
-lib/gcc-lib/avr/3.3/collect2
-lib/gcc-lib/avr/3.3/include/README
-lib/gcc-lib/avr/3.3/include/fixed
-lib/gcc-lib/avr/3.3/include/float.h
-lib/gcc-lib/avr/3.3/include/iso646.h
-lib/gcc-lib/avr/3.3/include/limits.h
-lib/gcc-lib/avr/3.3/include/stdarg.h
-lib/gcc-lib/avr/3.3/include/stdbool.h
-lib/gcc-lib/avr/3.3/include/stddef.h
-lib/gcc-lib/avr/3.3/include/syslimits.h
-lib/gcc-lib/avr/3.3/include/unwind.h
-lib/gcc-lib/avr/3.3/include/varargs.h
-lib/gcc-lib/avr/3.3/install-tools/fix-header
-lib/gcc-lib/avr/3.3/install-tools/fixinc.sh
-lib/gcc-lib/avr/3.3/install-tools/fixincl
-lib/gcc-lib/avr/3.3/install-tools/fixproto
-lib/gcc-lib/avr/3.3/install-tools/gsyslimits.h
-lib/gcc-lib/avr/3.3/install-tools/include/README
-lib/gcc-lib/avr/3.3/install-tools/include/float.h
-lib/gcc-lib/avr/3.3/install-tools/include/iso646.h
-lib/gcc-lib/avr/3.3/install-tools/include/limits.h
-lib/gcc-lib/avr/3.3/install-tools/include/stdarg.h
-lib/gcc-lib/avr/3.3/install-tools/include/stdbool.h
-lib/gcc-lib/avr/3.3/install-tools/include/stddef.h
-lib/gcc-lib/avr/3.3/install-tools/include/unwind.h
-lib/gcc-lib/avr/3.3/install-tools/include/varargs.h
-lib/gcc-lib/avr/3.3/install-tools/mkheaders
-lib/gcc-lib/avr/3.3/install-tools/mkheaders.conf
-lib/gcc-lib/avr/3.3/install-tools/mkinstalldirs
-lib/gcc-lib/avr/3.3/libgcc.a
-lib/gcc-lib/avr/3.3/specs
+lib/gcc-lib/avr/3.3.1/avr3/libgcc.a
+lib/gcc-lib/avr/3.3.1/avr4/libgcc.a
+lib/gcc-lib/avr/3.3.1/avr5/libgcc.a
+lib/gcc-lib/avr/3.3.1/cc1
+lib/gcc-lib/avr/3.3.1/cc1plus
+lib/gcc-lib/avr/3.3.1/collect2
+lib/gcc-lib/avr/3.3.1/include/README
+lib/gcc-lib/avr/3.3.1/include/fixed
+lib/gcc-lib/avr/3.3.1/include/float.h
+lib/gcc-lib/avr/3.3.1/include/iso646.h
+lib/gcc-lib/avr/3.3.1/include/limits.h
+lib/gcc-lib/avr/3.3.1/include/stdarg.h
+lib/gcc-lib/avr/3.3.1/include/stdbool.h
+lib/gcc-lib/avr/3.3.1/include/stddef.h
+lib/gcc-lib/avr/3.3.1/include/syslimits.h
+lib/gcc-lib/avr/3.3.1/include/unwind.h
+lib/gcc-lib/avr/3.3.1/include/varargs.h
+lib/gcc-lib/avr/3.3.1/install-tools/fix-header
+lib/gcc-lib/avr/3.3.1/install-tools/fixinc.sh
+lib/gcc-lib/avr/3.3.1/install-tools/fixincl
+lib/gcc-lib/avr/3.3.1/install-tools/fixproto
+lib/gcc-lib/avr/3.3.1/install-tools/gsyslimits.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/README
+lib/gcc-lib/avr/3.3.1/install-tools/include/float.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/iso646.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/limits.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stdarg.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stdbool.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stddef.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/unwind.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/varargs.h
+lib/gcc-lib/avr/3.3.1/install-tools/mkheaders
+lib/gcc-lib/avr/3.3.1/install-tools/mkheaders.conf
+lib/gcc-lib/avr/3.3.1/install-tools/mkinstalldirs
+lib/gcc-lib/avr/3.3.1/libgcc.a
+lib/gcc-lib/avr/3.3.1/specs
 share/locale/be/LC_MESSAGES/gcc.mo
 share/locale/da/LC_MESSAGES/gcc.mo
 share/locale/de/LC_MESSAGES/gcc.mo
@@ -66,11 +66,11 @@ share/locale/ja/LC_MESSAGES/gcc.mo
 share/locale/nl/LC_MESSAGES/gcc.mo
 share/locale/sv/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
-@dirrm lib/gcc-lib/avr/3.3/avr3
-@dirrm lib/gcc-lib/avr/3.3/avr4
-@dirrm lib/gcc-lib/avr/3.3/avr5
-@dirrm lib/gcc-lib/avr/3.3/include
-@dirrm lib/gcc-lib/avr/3.3/install-tools/include
-@dirrm lib/gcc-lib/avr/3.3/install-tools
-@dirrm lib/gcc-lib/avr/3.3
+@dirrm lib/gcc-lib/avr/3.3.1/avr3
+@dirrm lib/gcc-lib/avr/3.3.1/avr4
+@dirrm lib/gcc-lib/avr/3.3.1/avr5
+@dirrm lib/gcc-lib/avr/3.3.1/include
+@dirrm lib/gcc-lib/avr/3.3.1/install-tools/include
+@dirrm lib/gcc-lib/avr/3.3.1/install-tools
+@dirrm lib/gcc-lib/avr/3.3.1
 @dirrm lib/gcc-lib/avr
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index ee1d9fab4e43..89bb6a378706 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	3.3.2003.05.11
+PORTVERSION=	3.3.2003.07.07
 PORTREVISION=	0
 CATEGORIES=	devel
 #MASTER_SITES=	${MASTER_SITE_GNU}
@@ -40,7 +40,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAN_AUX=	gcc-man.2003.05.11.gz
+MAN_AUX=	gcc-man.2003.07.07.tar.gz
 
 MAKE_FLAGS=	LANGUAGES="c c++"
 # get rid of that silly -mcpu=pentiumpro -current is so fond of. :-(
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index 267dade0d043..cda63ff33131 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcc-core+g++-3.3.2003.05.11.tar.bz2) = 3d19ec297715fe9aa185856d2b8b203d
-MD5 (gcc-man.2003.05.11.gz) = 3dcf33d205597e11b34870739d3aa558
+MD5 (gcc-core+g++-3.3.2003.07.07.tar.bz2) = acbcf78e0a8609b6eecfc45ef0c10d25
+MD5 (gcc-man.2003.07.07.tar.gz) = 86dfb21a3003c86d9a5b913129cb21be
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index 4a7925ccb18d..3d29b2d011a2 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -5,7 +5,7 @@ bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/avr-gcc-3.3
+bin/avr-gcc-3.3.1
 bin/avr-gccbug
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
@@ -20,42 +20,42 @@ info/gccint.info
 @exec install-info %D/info/gccint.info %D/info/dir
 @exec install-info %D/info/cppinternals.info %D/info/dir
 lib/charset.alias
-lib/gcc-lib/avr/3.3/avr3/libgcc.a
-lib/gcc-lib/avr/3.3/avr4/libgcc.a
-lib/gcc-lib/avr/3.3/avr5/libgcc.a
-lib/gcc-lib/avr/3.3/cc1
-lib/gcc-lib/avr/3.3/cc1plus
-lib/gcc-lib/avr/3.3/collect2
-lib/gcc-lib/avr/3.3/include/README
-lib/gcc-lib/avr/3.3/include/fixed
-lib/gcc-lib/avr/3.3/include/float.h
-lib/gcc-lib/avr/3.3/include/iso646.h
-lib/gcc-lib/avr/3.3/include/limits.h
-lib/gcc-lib/avr/3.3/include/stdarg.h
-lib/gcc-lib/avr/3.3/include/stdbool.h
-lib/gcc-lib/avr/3.3/include/stddef.h
-lib/gcc-lib/avr/3.3/include/syslimits.h
-lib/gcc-lib/avr/3.3/include/unwind.h
-lib/gcc-lib/avr/3.3/include/varargs.h
-lib/gcc-lib/avr/3.3/install-tools/fix-header
-lib/gcc-lib/avr/3.3/install-tools/fixinc.sh
-lib/gcc-lib/avr/3.3/install-tools/fixincl
-lib/gcc-lib/avr/3.3/install-tools/fixproto
-lib/gcc-lib/avr/3.3/install-tools/gsyslimits.h
-lib/gcc-lib/avr/3.3/install-tools/include/README
-lib/gcc-lib/avr/3.3/install-tools/include/float.h
-lib/gcc-lib/avr/3.3/install-tools/include/iso646.h
-lib/gcc-lib/avr/3.3/install-tools/include/limits.h
-lib/gcc-lib/avr/3.3/install-tools/include/stdarg.h
-lib/gcc-lib/avr/3.3/install-tools/include/stdbool.h
-lib/gcc-lib/avr/3.3/install-tools/include/stddef.h
-lib/gcc-lib/avr/3.3/install-tools/include/unwind.h
-lib/gcc-lib/avr/3.3/install-tools/include/varargs.h
-lib/gcc-lib/avr/3.3/install-tools/mkheaders
-lib/gcc-lib/avr/3.3/install-tools/mkheaders.conf
-lib/gcc-lib/avr/3.3/install-tools/mkinstalldirs
-lib/gcc-lib/avr/3.3/libgcc.a
-lib/gcc-lib/avr/3.3/specs
+lib/gcc-lib/avr/3.3.1/avr3/libgcc.a
+lib/gcc-lib/avr/3.3.1/avr4/libgcc.a
+lib/gcc-lib/avr/3.3.1/avr5/libgcc.a
+lib/gcc-lib/avr/3.3.1/cc1
+lib/gcc-lib/avr/3.3.1/cc1plus
+lib/gcc-lib/avr/3.3.1/collect2
+lib/gcc-lib/avr/3.3.1/include/README
+lib/gcc-lib/avr/3.3.1/include/fixed
+lib/gcc-lib/avr/3.3.1/include/float.h
+lib/gcc-lib/avr/3.3.1/include/iso646.h
+lib/gcc-lib/avr/3.3.1/include/limits.h
+lib/gcc-lib/avr/3.3.1/include/stdarg.h
+lib/gcc-lib/avr/3.3.1/include/stdbool.h
+lib/gcc-lib/avr/3.3.1/include/stddef.h
+lib/gcc-lib/avr/3.3.1/include/syslimits.h
+lib/gcc-lib/avr/3.3.1/include/unwind.h
+lib/gcc-lib/avr/3.3.1/include/varargs.h
+lib/gcc-lib/avr/3.3.1/install-tools/fix-header
+lib/gcc-lib/avr/3.3.1/install-tools/fixinc.sh
+lib/gcc-lib/avr/3.3.1/install-tools/fixincl
+lib/gcc-lib/avr/3.3.1/install-tools/fixproto
+lib/gcc-lib/avr/3.3.1/install-tools/gsyslimits.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/README
+lib/gcc-lib/avr/3.3.1/install-tools/include/float.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/iso646.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/limits.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stdarg.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stdbool.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/stddef.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/unwind.h
+lib/gcc-lib/avr/3.3.1/install-tools/include/varargs.h
+lib/gcc-lib/avr/3.3.1/install-tools/mkheaders
+lib/gcc-lib/avr/3.3.1/install-tools/mkheaders.conf
+lib/gcc-lib/avr/3.3.1/install-tools/mkinstalldirs
+lib/gcc-lib/avr/3.3.1/libgcc.a
+lib/gcc-lib/avr/3.3.1/specs
 share/locale/be/LC_MESSAGES/gcc.mo
 share/locale/da/LC_MESSAGES/gcc.mo
 share/locale/de/LC_MESSAGES/gcc.mo
@@ -66,11 +66,11 @@ share/locale/ja/LC_MESSAGES/gcc.mo
 share/locale/nl/LC_MESSAGES/gcc.mo
 share/locale/sv/LC_MESSAGES/gcc.mo
 share/locale/tr/LC_MESSAGES/gcc.mo
-@dirrm lib/gcc-lib/avr/3.3/avr3
-@dirrm lib/gcc-lib/avr/3.3/avr4
-@dirrm lib/gcc-lib/avr/3.3/avr5
-@dirrm lib/gcc-lib/avr/3.3/include
-@dirrm lib/gcc-lib/avr/3.3/install-tools/include
-@dirrm lib/gcc-lib/avr/3.3/install-tools
-@dirrm lib/gcc-lib/avr/3.3
+@dirrm lib/gcc-lib/avr/3.3.1/avr3
+@dirrm lib/gcc-lib/avr/3.3.1/avr4
+@dirrm lib/gcc-lib/avr/3.3.1/avr5
+@dirrm lib/gcc-lib/avr/3.3.1/include
+@dirrm lib/gcc-lib/avr/3.3.1/install-tools/include
+@dirrm lib/gcc-lib/avr/3.3.1/install-tools
+@dirrm lib/gcc-lib/avr/3.3.1
 @dirrm lib/gcc-lib/avr