diff --git a/ChangeLog b/ChangeLog
index e2180d42824..0d24de865b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 31 13:52:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in (alpha-dec-osf*): Use osf*, not osf1*.  Don't
+	configure ld--it works, but it doesn't support shared libraries.
+
 Sun Aug 28 18:13:45 1994  Per Bothner  (bothner@kalessin.cygnus.com)
 
 	* config.guess (*-unknown-freebsd*):  Get rid of possible
diff --git a/configure.in b/configure.in
index f35aa897e6b..657339dd9db 100644
--- a/configure.in
+++ b/configure.in
@@ -301,10 +301,14 @@ esac
 
 
 case "${target}" in
-  alpha-dec-osf1*)
-    noconfigdirs="$noconfigdirs emacs emacs19 fileutils grep newlib"
+  alpha-dec-osf*)
+    # ld works, but does not support shared libraries.  emacs doesn't
+    # work.  newlib is not 64 bit ready.  I'm not sure about emacs19,
+    # fileutils or grep.
+    noconfigdirs="$noconfigdirs ld emacs emacs19 fileutils grep newlib"
     ;;	
   alpha*-*-*)
+    # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs newlib"
     ;;    
   h8300*-*-* | \