diff --git a/lang/gcc/4.1/Makefile b/lang/gcc/4.1/Makefile
index 1cc05ba152a..80d22ba0f5c 100644
--- a/lang/gcc/4.1/Makefile
+++ b/lang/gcc/4.1/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2005/05/21 10:34:43 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2005/05/29 13:26:49 espie Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax
 
 V=4.1.0
-FULL_VERSION=4.1-20050515
+FULL_VERSION=4.1-20050528
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
diff --git a/lang/gcc/4.1/distinfo b/lang/gcc/4.1/distinfo
index 711d4d497d0..53323847105 100644
--- a/lang/gcc/4.1/distinfo
+++ b/lang/gcc/4.1/distinfo
@@ -1,8 +1,8 @@
 MD5 (gcc/adastrap-i386-3.3.5-1.tgz) = f8c1992077e0b713922e738210dd3674
-MD5 (gcc/gcc-4.1-20050515.tar.bz2) = f6d9ee772b67a1c3d39db77a61c2ebb3
+MD5 (gcc/gcc-4.1-20050528.tar.bz2) = 38e650684282d96cf7ad1b5928399142
 RMD160 (gcc/adastrap-i386-3.3.5-1.tgz) = 644b12c337b02ea5c02735f0ea3830081761bf26
-RMD160 (gcc/gcc-4.1-20050515.tar.bz2) = 040e76319e6322d12cd9127d374d28953906a4c7
+RMD160 (gcc/gcc-4.1-20050528.tar.bz2) = b0f53f4987be6aa92b22f7ca66bf44408e676d47
 SHA1 (gcc/adastrap-i386-3.3.5-1.tgz) = 4c26ff21dcecbc37afa31b8ef63d5cdd7fe65d7e
-SHA1 (gcc/gcc-4.1-20050515.tar.bz2) = db60226f1e156e7b51abf0934cf466d1f8f3fcaf
+SHA1 (gcc/gcc-4.1-20050528.tar.bz2) = 39a89d7577bda2c6e5360d12d49a4830f1894ca1
 SIZE (gcc/adastrap-i386-3.3.5-1.tgz) = 12121161
-SIZE (gcc/gcc-4.1-20050515.tar.bz2) = 30148616
+SIZE (gcc/gcc-4.1-20050528.tar.bz2) = 30251177
diff --git a/lang/gcc/4.1/patches/patch-gcc_cp_parser_c b/lang/gcc/4.1/patches/patch-gcc_cp_parser_c
index 1914eb35d78..fa8bddc5947 100644
--- a/lang/gcc/4.1/patches/patch-gcc_cp_parser_c
+++ b/lang/gcc/4.1/patches/patch-gcc_cp_parser_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_cp_parser_c,v 1.3 2005/05/21 10:34:43 espie Exp $
---- gcc/cp/parser.c.orig	Sat Apr 23 23:28:55 2005
-+++ gcc/cp/parser.c	Mon May 16 17:43:11 2005
-@@ -15650,7 +15650,7 @@ cp_parser_require (cp_parser* parser,
+$OpenBSD: patch-gcc_cp_parser_c,v 1.4 2005/05/29 13:26:49 espie Exp $
+--- gcc/cp/parser.c.orig	Sat May 28 01:17:14 2005
++++ gcc/cp/parser.c	Sun May 29 13:55:46 2005
+@@ -15789,7 +15789,7 @@ cp_parser_require (cp_parser* parser,
        /* Output the MESSAGE -- unless we're parsing tentatively.  */
        if (!cp_parser_simulate_error (parser))
  	{
diff --git a/lang/gcc/4.1/patches/patch-gcc_dbxout_c b/lang/gcc/4.1/patches/patch-gcc_dbxout_c
index 0c2e0f01332..17a4e6fc93f 100644
--- a/lang/gcc/4.1/patches/patch-gcc_dbxout_c
+++ b/lang/gcc/4.1/patches/patch-gcc_dbxout_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_dbxout_c,v 1.3 2005/05/21 10:34:43 espie Exp $
---- gcc/dbxout.c.orig	Fri Apr 29 02:27:44 2005
-+++ gcc/dbxout.c	Mon May 16 17:43:12 2005
-@@ -1009,7 +1009,7 @@ dbxout_init (const char *input_file_name
+$OpenBSD: patch-gcc_dbxout_c,v 1.4 2005/05/29 13:26:49 espie Exp $
+--- gcc/dbxout.c.orig	Tue May 17 22:11:41 2005
++++ gcc/dbxout.c	Sun May 29 13:55:46 2005
+@@ -1011,7 +1011,7 @@ dbxout_init (const char *input_file_name
  	  if (cwd[0] == '\0')
  	    cwd = "/";
  	  else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
diff --git a/lang/gcc/4.1/patches/patch-gcc_objc_objc-act_c b/lang/gcc/4.1/patches/patch-gcc_objc_objc-act_c
index 346d15dce56..e2632e44d2c 100644
--- a/lang/gcc/4.1/patches/patch-gcc_objc_objc-act_c
+++ b/lang/gcc/4.1/patches/patch-gcc_objc_objc-act_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_objc_objc-act_c,v 1.2 2005/03/07 16:30:06 espie Exp $
---- gcc/objc/objc-act.c.orig	Sat Jan 29 13:16:34 2005
-+++ gcc/objc/objc-act.c	Tue Feb 22 19:38:42 2005
-@@ -546,7 +546,7 @@ objc_init (void)
+$OpenBSD: patch-gcc_objc_objc-act_c,v 1.3 2005/05/29 13:26:49 espie Exp $
+--- gcc/objc/objc-act.c.orig	Wed May 25 17:48:44 2005
++++ gcc/objc/objc-act.c	Sun May 29 13:55:47 2005
+@@ -494,7 +494,7 @@ objc_init (void)
    /* If gen_declaration desired, open the output file.  */
    if (flag_gen_declaration)
      {
diff --git a/lang/gcc/4.1/patches/patch-gcc_read-rtl_c b/lang/gcc/4.1/patches/patch-gcc_read-rtl_c
index 18e895c936f..11627861914 100644
--- a/lang/gcc/4.1/patches/patch-gcc_read-rtl_c
+++ b/lang/gcc/4.1/patches/patch-gcc_read-rtl_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_read-rtl_c,v 1.2 2005/05/21 10:34:43 espie Exp $
---- gcc/read-rtl.c.orig	Wed May 11 00:40:36 2005
-+++ gcc/read-rtl.c	Mon May 16 17:43:13 2005
-@@ -774,7 +774,7 @@ join_c_conditions (const char *cond1, co
+$OpenBSD: patch-gcc_read-rtl_c,v 1.3 2005/05/29 13:26:49 espie Exp $
+--- gcc/read-rtl.c.orig	Wed May 18 15:46:39 2005
++++ gcc/read-rtl.c	Sun May 29 13:55:47 2005
+@@ -781,7 +781,7 @@ join_c_conditions (const char *cond1, co
    if (cond2 == 0 || cond2[0] == 0)
      return cond1;
  
diff --git a/lang/gcc/4.1/patches/patch-gcc_tree-nested_c b/lang/gcc/4.1/patches/patch-gcc_tree-nested_c
index a5998df5db9..afba8a52f41 100644
--- a/lang/gcc/4.1/patches/patch-gcc_tree-nested_c
+++ b/lang/gcc/4.1/patches/patch-gcc_tree-nested_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-nested_c,v 1.2 2005/03/07 16:30:06 espie Exp $
---- gcc/tree-nested.c.orig	Sat Dec 18 19:59:04 2004
-+++ gcc/tree-nested.c	Mon Jan  3 15:47:20 2005
-@@ -200,7 +200,7 @@ get_frame_type (struct nesting_info *inf
+$OpenBSD: patch-gcc_tree-nested_c,v 1.3 2005/05/29 13:26:49 espie Exp $
+--- gcc/tree-nested.c.orig	Wed May 25 23:36:24 2005
++++ gcc/tree-nested.c	Sun May 29 13:55:47 2005
+@@ -214,7 +214,7 @@ get_frame_type (struct nesting_info *inf
  
        name = concat ("FRAME.",
  		     IDENTIFIER_POINTER (DECL_NAME (info->context)),
diff --git a/lang/gcc/4.1/patches/patch-gcc_tree-optimize_c b/lang/gcc/4.1/patches/patch-gcc_tree-optimize_c
index f9bcd410247..09b8c7a1bce 100644
--- a/lang/gcc/4.1/patches/patch-gcc_tree-optimize_c
+++ b/lang/gcc/4.1/patches/patch-gcc_tree-optimize_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-optimize_c,v 1.3 2005/05/21 10:34:43 espie Exp $
---- gcc/tree-optimize.c.orig	Sat May 14 22:22:58 2005
-+++ gcc/tree-optimize.c	Mon May 16 17:48:31 2005
-@@ -202,26 +202,26 @@ register_one_dump_file (struct tree_opt_
+$OpenBSD: patch-gcc_tree-optimize_c,v 1.4 2005/05/29 13:26:49 espie Exp $
+--- gcc/tree-optimize.c.orig	Wed May 25 14:33:36 2005
++++ gcc/tree-optimize.c	Sun May 29 13:55:47 2005
+@@ -248,26 +248,26 @@ register_one_dump_file (struct tree_opt_
      sprintf (num, "%d", ((int) pass->static_pass_number < 0
  			 ? 1 : pass->static_pass_number));
  
diff --git a/lang/gcc/4.1/patches/patch-gcc_tree_c b/lang/gcc/4.1/patches/patch-gcc_tree_c
index 04a15f1e4ab..3f17e2f9645 100644
--- a/lang/gcc/4.1/patches/patch-gcc_tree_c
+++ b/lang/gcc/4.1/patches/patch-gcc_tree_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree_c,v 1.3 2005/05/21 10:34:43 espie Exp $
---- gcc/tree.c.orig	Wed May 11 18:25:29 2005
-+++ gcc/tree.c	Mon May 16 17:43:15 2005
-@@ -5871,11 +5871,11 @@ build_common_builtin_nodes (void)
+$OpenBSD: patch-gcc_tree_c,v 1.4 2005/05/29 13:26:49 espie Exp $
+--- gcc/tree.c.orig	Thu May 26 20:14:51 2005
++++ gcc/tree.c	Sun May 29 13:55:47 2005
+@@ -5866,11 +5866,11 @@ build_common_builtin_nodes (void)
  	  *q = TOLOWER (*p);
  	*q = '\0';
  
diff --git a/lang/gcc/4.1/pkg/PFRAG.shared-estdc b/lang/gcc/4.1/pkg/PFRAG.shared-estdc
index d653ef32dc5..e3ab6ad11b8 100644
--- a/lang/gcc/4.1/pkg/PFRAG.shared-estdc
+++ b/lang/gcc/4.1/pkg/PFRAG.shared-estdc
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared-estdc,v 1.2 2005/03/07 16:30:06 espie Exp $
-@lib lib/libestdc++.so.6.4
+@comment $OpenBSD: PFRAG.shared-estdc,v 1.3 2005/05/29 13:26:49 espie Exp $
+@lib lib/libestdc++.so.6.5
diff --git a/lang/gcc/4.1/pkg/PLIST-c++ b/lang/gcc/4.1/pkg/PLIST-c++
index 1d6821aeb60..68d3fe77db6 100644
--- a/lang/gcc/4.1/pkg/PLIST-c++
+++ b/lang/gcc/4.1/pkg/PLIST-c++
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-c++,v 1.3 2005/05/21 10:34:43 espie Exp $
+@comment $OpenBSD: PLIST-c++,v 1.4 2005/05/29 13:26:49 espie Exp $
 bin/ec++
 bin/eg++
 bin/${CONFIG}-ec++
@@ -155,6 +155,7 @@ include/c++/${V}/debug/bitset
 include/c++/${V}/debug/debug.h
 include/c++/${V}/debug/deque
 include/c++/${V}/debug/formatter.h
+include/c++/${V}/debug/functions.h
 include/c++/${V}/debug/hash_map
 include/c++/${V}/debug/hash_map.h
 include/c++/${V}/debug/hash_multimap.h
@@ -162,6 +163,7 @@ include/c++/${V}/debug/hash_multiset.h
 include/c++/${V}/debug/hash_set
 include/c++/${V}/debug/hash_set.h
 include/c++/${V}/debug/list
+include/c++/${V}/debug/macros.h
 include/c++/${V}/debug/map
 include/c++/${V}/debug/map.h
 include/c++/${V}/debug/multimap.h