diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index e704b2356f1..92b5600239a 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR libgomp/29949
+	* env.c (omp_set_num_threads): Set illegal thread count to 1.
+
 2006-12-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* configure: Regenerate.
diff --git a/libgomp/env.c b/libgomp/env.c
index af7e0c5c813..f07b31b914b 100644
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -225,7 +225,7 @@ initialize_env (void)
 void
 omp_set_num_threads (int n)
 {
-  gomp_nthreads_var = n;
+  gomp_nthreads_var = (n > 0 ? n : 1);
 }
 
 void