diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index a2eb578160..c8963596cf 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,9 @@
 Mon Sep 22 11:46:20 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
+	* sim-config.h (WITH_DEFAULT_ALIGNMENT): Don't hardwire any alignment.
+
+	* sim-options.c (standard_option_handler): Typo in warning message.
+
 	* sim-base.h (STATE_MODEL): Make conditional on SIM_HAVE_MODEL.
 
 	* sim-profile.c (profile_print_insn): Check 0 .. MAX_INSN for any
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index ebc009f274..95ad6a249d 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,6 +1,7 @@
 Mon Sep 22 11:46:20 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* configure.in: Really specify NONSTRICT_ALIGNMENT as the default.
 
 Fri Sep 19 17:45:25 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
diff --git a/sim/v850/configure b/sim/v850/configure
index cdb603f051..a1eda849ea 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -1329,8 +1329,8 @@ else
 fi
 
 
-wire_alignment="NONSTRICT_ALIGNMENT"
-default_alignment=""
+wire_alignment=""
+default_alignment="NONSTRICT_ALIGNMENT"
 
 # Check whether --enable-sim-alignment or --disable-sim-alignment was given.
 if test "${enable_sim_alignment+set}" = set; then
diff --git a/sim/v850/configure.in b/sim/v850/configure.in
index 0a74c5ce8b..dfa4f02482 100644
--- a/sim/v850/configure.in
+++ b/sim/v850/configure.in
@@ -6,7 +6,7 @@ AC_INIT(Makefile.in)
 SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
-SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
+SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT)
 SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_RESERVED_BITS