diff --git a/ChangeLog b/ChangeLog
index a7a08e8df..c003874d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (enable_libgomp): Remove *-*-osf*.
+	(with_stabs): Remove alpha*-*-osf*.
+	* configure: Regenerate.
+
 2012-03-09  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* COPYING.NEWLIB: Modify DJ Delorie license to include
diff --git a/configure b/configure
index 3ca99b9e9..81e096aad 100755
--- a/configure
+++ b/configure
@@ -3054,7 +3054,7 @@ if test x$enable_libgomp = x ; then
 	;;
     *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
 	;;
-    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
+    *-*-solaris2* | *-*-irix6* | *-*-hpux11*)
 	;;
     *-*-darwin* | *-*-aix*)
 	;;
@@ -6878,7 +6878,7 @@ if test x${with_stabs} = x ; then
   case "${target}" in
   mips*-*-irix[56]*)
     ;;
-  mips*-*-* | alpha*-*-osf*)
+  mips*-*-*)
     with_stabs=yes;
     extra_host_args="${extra_host_args} --with-stabs"
     ;;
diff --git a/configure.ac b/configure.ac
index c24fff4e5..fd020dfe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,7 +483,7 @@ if test x$enable_libgomp = x ; then
 	;;
     *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
 	;;
-    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
+    *-*-solaris2* | *-*-irix6* | *-*-hpux11*)
 	;;
     *-*-darwin* | *-*-aix*)
 	;;
@@ -2336,7 +2336,7 @@ if test x${with_stabs} = x ; then
   case "${target}" in
   mips*-*-irix[[56]]*)
     ;;
-  mips*-*-* | alpha*-*-osf*)
+  mips*-*-*)
     with_stabs=yes;
     extra_host_args="${extra_host_args} --with-stabs"
     ;;