diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index de35c563841..260d9680dc0 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12  Roger Sayle  <roger@eyesopen.com>
+	    John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	PR libgomp/25936
+	* configure.tgt: Link against -lrt for sem_init on HPUX v11 systems.
+ 
 2006-02-08  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* testsuite/lib/libgomp-dg.exp: Load scanrtl.exp library.
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index f9679debc25..dedafd350aa 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -86,6 +86,11 @@ fi
 # Other system configury
 case "${target}" in
 
+  *-*-hpux11*)
+	# HPUX v11.x requires -lrt to resolve sem_init in libgomp.la
+	XLDFLAGS="${XLDFLAGS} -lrt"
+	;;
+
   *)
 	;;