diff --git a/ChangeLog b/ChangeLog
index 8fb34eb56a..b83cf2508c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Mon Apr 25 15:06:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+ 	* configure.in (*-*-lynxos*): Don't configure newlib for either
+ 	native or cross Lynx.
+
 Sat Apr 16 11:58:16 1994  Doug Evans  (dje@canuck.cygnus.com)
 
 	* config.sub (sparc64-elf): Fix os.
+	(z8k): Remove duplicate.
 
 Thu Apr 14 23:33:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
diff --git a/configure.in b/configure.in
index 924edac3d9..d47c6981d4 100644
--- a/configure.in
+++ b/configure.in
@@ -107,10 +107,8 @@ case "${host}" in
   *-sun-*)		  host_makefile_frag=config/mh-sun ;;
   *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
   *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
-  rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxosrs6k
-				cross_only="xiberty" ;;
-  *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos
-				cross_only="xiberty" ;;
+  rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxosrs6k ;;
+  *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos ;;
   *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
   *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
 esac
@@ -262,6 +260,10 @@ case "${target}" in
   *-*-sysv4)
     use_gnu_ld=no
     ;;
+   *-*-lynxos*)
+     # Newlib makes problems for libg++ in crosses.
+     noconfigdirs="$noconfigdirs newlib"
+     ;;    
   *-*-vms)
     noconfigdirs="$noconfigdirs bfd ld binutils gdb"
     ;;