diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 671b48bde76..ded506b0636 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* team.c (gomp_team_end): Free team immediately if it has
+	just one thread.
+
 2008-07-08  David Edelsohn  <edelsohn@gnu.org>
 
 	* testsuite/libgomp.c++/c++.exp: Append multilib library path.
diff --git a/libgomp/team.c b/libgomp/team.c
index 18b02e72f90..224236c6604 100644
--- a/libgomp/team.c
+++ b/libgomp/team.c
@@ -498,7 +498,8 @@ gomp_team_end (void)
   gomp_mutex_destroy (&team->work_share_list_free_lock);
 #endif
 
-  if (__builtin_expect (thr->ts.team != NULL, 0))
+  if (__builtin_expect (thr->ts.team != NULL, 0)
+      || __builtin_expect (team->nthreads == 1, 0))
     free_team (team);
   else
     {