diff --git a/ChangeLog b/ChangeLog
index 651e83c14..030b2dae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-23  Joern Rennecke  <amylaar@spamcop.net>
+
+	gcc PR libstdc++/36101, gcc PR libstdc++/42813
+	* configure.ac (bootstrap_target_libs): Include target-libgomp.
+	* configure: Regenerate.
+
 2010-01-22  Joern Rennecke  <amylaar@spamcop.net>
 
 	gcc PR libstdc++/36101, gcc PR libstdc++/42813
diff --git a/configure b/configure
index e8d6b6f8b..053a9f40e 100755
--- a/configure
+++ b/configure
@@ -6513,7 +6513,7 @@ fi
 stage1_languages=,c,
 
 # Target libraries that we bootstrap.
-bootstrap_target_libs=,target-libgcc,
+bootstrap_target_libs=,target-libgcc,target-libgomp,
 
 # Figure out what language subdirectories are present.
 # Look if the user specified --enable-languages="..."; if not, use
diff --git a/configure.ac b/configure.ac
index 90299d654..1bb8f8a5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1730,7 +1730,7 @@ fi
 stage1_languages=,c,
 
 # Target libraries that we bootstrap.
-bootstrap_target_libs=,target-libgcc,
+bootstrap_target_libs=,target-libgcc,target-libgomp,
 
 # Figure out what language subdirectories are present.
 # Look if the user specified --enable-languages="..."; if not, use