diff --git a/lang/gcc/3.3/Makefile b/lang/gcc/3.3/Makefile
index 94303af1ab0..b1b2c63c48c 100644
--- a/lang/gcc/3.3/Makefile
+++ b/lang/gcc/3.3/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.11 2005/09/14 10:41:02 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2005/10/30 19:24:11 espie Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax
 
 V=3.3.6
-FULL_VERSION=3.3-20050223
-FULL_PKGVERSION=3.3.20050223
+FULL_VERSION=3.3.6
+FULL_PKGVERSION=3.3.6
 
-PKGNAME=	gcc-${FULL_PKGVERSION}p0
-PKGNAME-c++ =	g++-${FULL_PKGVERSION}p0
-PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}p0
-PKGNAME-g77=	g77-${FULL_PKGVERSION}p0
-PKGNAME-java=	gcj-${FULL_PKGVERSION}p0
-PKGNAME-objc=	gobjc-${FULL_PKGVERSION}p0
+PKGNAME=	gcc-${FULL_PKGVERSION}
+PKGNAME-c++ =	g++-${FULL_PKGVERSION}
+PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}
+PKGNAME-g77=	g77-${FULL_PKGVERSION}
+PKGNAME-java=	gcj-${FULL_PKGVERSION}
+PKGNAME-objc=	gobjc-${FULL_PKGVERSION}
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
@@ -69,7 +69,7 @@ DISTNAME=	gcc-${FULL_VERSION}
 DISTFILES=  ${DISTNAME}.tar.bz2
 SUPDISTFILES=adastrap-i386-3.3.6-2.tgz:0
 
-MASTER_SITES=	${MASTER_SITE_GCC:=snapshots/$(FULL_VERSION)/}
+MASTER_SITES=	${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
 MASTER_SITES0=	ftp://quatramaran.ens.fr/pub/espie/
 
 CONFIGURE_STYLE=	gnu
diff --git a/lang/gcc/3.3/distinfo b/lang/gcc/3.3/distinfo
index aa294d09557..8980c63741f 100644
--- a/lang/gcc/3.3/distinfo
+++ b/lang/gcc/3.3/distinfo
@@ -1,8 +1,8 @@
 MD5 (gcc/adastrap-i386-3.3.6-2.tgz) = b68d09a90e69302eb53d2d405eae256f
-MD5 (gcc/gcc-3.3-20050223.tar.bz2) = 07396751087c10509e29c4d4feab8702
+MD5 (gcc/gcc-3.3.6.tar.bz2) = 6936616a967da5a0b46f1e7424a06414
 RMD160 (gcc/adastrap-i386-3.3.6-2.tgz) = 9ccdebefa77ff0d8efaaa02f1f8775bca6065870
-RMD160 (gcc/gcc-3.3-20050223.tar.bz2) = d453250812f79178310257915f85b131a6e70c53
+RMD160 (gcc/gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967
 SHA1 (gcc/adastrap-i386-3.3.6-2.tgz) = 752b7fd114dce04291a02210e9a64d56c72f47b4
-SHA1 (gcc/gcc-3.3-20050223.tar.bz2) = 6cb83d79972b02a8d321013a8a5e448f96a6c8de
+SHA1 (gcc/gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb
 SIZE (gcc/adastrap-i386-3.3.6-2.tgz) = 16737593
-SIZE (gcc/gcc-3.3-20050223.tar.bz2) = 21262610
+SIZE (gcc/gcc-3.3.6.tar.bz2) = 23972413
diff --git a/lang/gcc/3.3/patches/patch-gcc_cp_call_c b/lang/gcc/3.3/patches/patch-gcc_cp_call_c
index f44bcb61f34..4150cc076e3 100644
--- a/lang/gcc/3.3/patches/patch-gcc_cp_call_c
+++ b/lang/gcc/3.3/patches/patch-gcc_cp_call_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2005/01/03 15:21:26 espie Exp $
---- gcc/cp/call.c.orig	Wed Jul 28 04:17:21 2004
-+++ gcc/cp/call.c	Mon Jan  3 10:17:44 2005
-@@ -4616,6 +4616,10 @@ build_over_call (cand, args, flags)
+$OpenBSD: patch-gcc_cp_call_c,v 1.2 2005/10/30 19:24:11 espie Exp $
+--- gcc/cp/call.c.orig	Mon Apr  4 09:42:15 2005
++++ gcc/cp/call.c	Sun Oct 30 13:19:46 2005
+@@ -4599,6 +4599,10 @@ build_over_call (cand, args, flags)
      check_function_format (NULL, TYPE_ATTRIBUTES (TREE_TYPE (fn)),
  			   converted_args);
  
diff --git a/lang/gcc/3.3/patches/patch-gcc_testsuite_g++_old-deja_old-deja_exp b/lang/gcc/3.3/patches/patch-gcc_testsuite_g++_old-deja_old-deja_exp
new file mode 100644
index 00000000000..33b75548e4d
--- /dev/null
+++ b/lang/gcc/3.3/patches/patch-gcc_testsuite_g++_old-deja_old-deja_exp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_testsuite_g++_old-deja_old-deja_exp,v 1.1 2005/10/30 19:24:11 espie Exp $
+--- gcc/testsuite/g++.old-deja/old-deja.exp.orig	Sun Oct 30 18:15:19 2005
++++ gcc/testsuite/g++.old-deja/old-deja.exp	Sun Oct 30 18:15:27 2005
+@@ -52,7 +52,7 @@ foreach file [lsort [find $srcdir/$subdi
+     # We don't want old-dejagnu.exp to have to know about all the global
+     # variables we use.  For now we tell it about CXXFLAGS and LIBS and
+     # leave LDFLAGS alone.
+-    old-dejagnu $GXX_UNDER_TEST "$file" "$tfile" "" "$DEFAULT_CXXFLAGS" "-lstdc++"
++    old-dejagnu $GXX_UNDER_TEST "$file" "$tfile" "" "$DEFAULT_CXXFLAGS" "-lestdc++"
+ }
+ 
+ # The framework doesn't like to see any error remnants,
diff --git a/lang/gcc/3.3/patches/patch-libstdc++-v3_config_io_basic_file_stdio_cc b/lang/gcc/3.3/patches/patch-libstdc++-v3_config_io_basic_file_stdio_cc
new file mode 100644
index 00000000000..5e8048153b1
--- /dev/null
+++ b/lang/gcc/3.3/patches/patch-libstdc++-v3_config_io_basic_file_stdio_cc
@@ -0,0 +1,19 @@
+$OpenBSD: patch-libstdc++-v3_config_io_basic_file_stdio_cc,v 1.1 2005/10/30 19:24:11 espie Exp $
+--- libstdc++-v3/config/io/basic_file_stdio.cc.orig	Sun Oct 30 17:42:46 2005
++++ libstdc++-v3/config/io/basic_file_stdio.cc	Sun Oct 30 17:43:10 2005
+@@ -104,6 +104,7 @@ namespace std 
+   __basic_file<char>::~__basic_file()
+   { this->close(); }
+ 
++#if 0
+   // Preserved for binary compatibility only.
+   // Do not use.  Gone in 3.4.
+   void 
+@@ -114,6 +115,7 @@ namespace std 
+     if (r)
+       strcpy(__c_mode, r);
+   }
++#endif
+   
+   __basic_file<char>*
+   __basic_file<char>::sys_open(__c_file* __file, ios_base::openmode) 
diff --git a/lang/gcc/3.3/patches/patch-libstdc++-v3_src_Makefile_in b/lang/gcc/3.3/patches/patch-libstdc++-v3_src_Makefile_in
index 2a92e9feef9..710472e6fed 100644
--- a/lang/gcc/3.3/patches/patch-libstdc++-v3_src_Makefile_in
+++ b/lang/gcc/3.3/patches/patch-libstdc++-v3_src_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.1.1.1 2005/01/03 15:21:29 espie Exp $
---- libstdc++-v3/src/Makefile.in.orig	Mon Jan  3 10:54:34 2005
-+++ libstdc++-v3/src/Makefile.in	Mon Jan  3 10:55:23 2005
+$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2005/10/30 19:24:11 espie Exp $
+--- libstdc++-v3/src/Makefile.in.orig	Tue Jan 13 00:00:29 2004
++++ libstdc++-v3/src/Makefile.in	Sun Oct 30 19:08:43 2005
 @@ -145,7 +145,7 @@ glibcpp_srcdir = @glibcpp_srcdir@
  glibcpp_builddir = @glibcpp_builddir@
  toolexecdir = @glibcpp_toolexecdir@
diff --git a/lang/gcc/3.3/patches/patch-libstdc++-v3_src_localename_cc b/lang/gcc/3.3/patches/patch-libstdc++-v3_src_localename_cc
new file mode 100644
index 00000000000..6b7f80e625c
--- /dev/null
+++ b/lang/gcc/3.3/patches/patch-libstdc++-v3_src_localename_cc
@@ -0,0 +1,45 @@
+$OpenBSD: patch-libstdc++-v3_src_localename_cc,v 1.1 2005/10/30 19:24:11 espie Exp $
+--- libstdc++-v3/src/localename.cc.orig	Sun Oct 30 17:44:31 2005
++++ libstdc++-v3/src/localename.cc	Sun Oct 30 17:47:13 2005
+@@ -125,8 +125,9 @@ namespace std
+ 	for (size_t __i = 0; 
+ 	     __i < _S_categories_size + _S_extra_categories_size; ++__i)
+ 	  {
+-	    char* __new = new char[strlen(__imp._M_names[__i]) + 1];
+-	    strcpy(__new, __imp._M_names[__i]);
++	    size_t __sz = strlen(__imp._M_names[__i]) + 1;
++	    char* __new = new char[__sz];
++	    strlcpy(__new, __imp._M_names[__i], __sz);
+ 	    _M_names[__i] = __new;
+ 	  }
+       }
+@@ -166,7 +167,7 @@ namespace std
+ 		 __i < _S_categories_size + _S_extra_categories_size; ++__i)
+ 	      {
+ 		_M_names[__i] = new char[__len + 1];
+-		strcpy(_M_names[__i], __s);
++		strlcpy(_M_names[__i], __s, __len + 1);
+ 	      }
+ 	  }
+ 	else
+@@ -249,7 +250,7 @@ namespace std
+ 	 __i < _S_categories_size + _S_extra_categories_size; ++__i)
+       {
+ 	_M_names[__i]  = new (&facet_name[__i]) char[2];
+-	strcpy(_M_names[__i], locale::facet::_S_c_name);
++	strlcpy(_M_names[__i], locale::facet::_S_c_name, 2);
+       }
+ 
+     // This is needed as presently the C++ version of "C" locales
+@@ -326,8 +327,9 @@ namespace std
+ 	    if (strcmp(_M_names[__ix], "*") != 0 
+ 		&& strcmp(__imp->_M_names[__ix], "*") != 0)
+ 	      {
+-		char* __new = new char[strlen(__imp->_M_names[__ix]) + 1];
+-		strcpy(__new, __imp->_M_names[__ix]);
++	        size_t __sz = strlen(__imp->_M_names[__ix]) + 1;
++		char* __new = new char[__sz];
++		strlcpy(__new, __imp->_M_names[__ix], __sz);
+ 		delete [] _M_names[__ix];
+ 		_M_names[__ix] = __new;
+ 	      }