diff --git a/config.h.in b/config.h.in
index c89b10da..01d776c0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -105,9 +105,6 @@
 /* Enable support for running target in either endianness */
 #undef RISCV_ENABLE_DUAL_ENDIAN
 
-/* Enable hardware support for misaligned loads and stores */
-#undef RISCV_ENABLE_MISALIGNED
-
 /* Define if subproject MCPPBS_SPROJ_NORM is enabled */
 #undef SOFTFLOAT_ENABLED
 
diff --git a/configure b/configure
index 39371571..8511f37e 100755
--- a/configure
+++ b/configure
@@ -716,7 +716,6 @@ with_priv
 with_varch
 with_target
 enable_dirty
-enable_misaligned
 enable_dual_endian
 '
       ac_precious_vars='build_alias
@@ -1362,8 +1361,6 @@ Optional Features:
                           Enable all optional subprojects
   --enable-dirty          Enable hardware management of PTE accessed and dirty
                           bits
-  --enable-misaligned     Enable hardware support for misaligned loads and
-                          stores
   --enable-dual-endian    Enable support for running target in either
                           endianness
 
@@ -6061,19 +6058,6 @@ if test "x$enable_dirty" = "xyes"; then :
 $as_echo "#define RISCV_ENABLE_DIRTY /**/" >>confdefs.h
 
 
-fi
-
-# Check whether --enable-misaligned was given.
-if test "${enable_misaligned+set}" = set; then :
-  enableval=$enable_misaligned;
-fi
-
-if test "x$enable_misaligned" = "xyes"; then :
-
-
-$as_echo "#define RISCV_ENABLE_MISALIGNED /**/" >>confdefs.h
-
-
 fi
 
 # Check whether --enable-dual-endian was given.
diff --git a/riscv/riscv.ac b/riscv/riscv.ac
index 70d84381..cb921ef4 100644
--- a/riscv/riscv.ac
+++ b/riscv/riscv.ac
@@ -44,11 +44,6 @@ AS_IF([test "x$enable_dirty" = "xyes"], [
   AC_DEFINE([RISCV_ENABLE_DIRTY],,[Enable hardware management of PTE accessed and dirty bits])
 ])
 
-AC_ARG_ENABLE([misaligned], AS_HELP_STRING([--enable-misaligned], [Enable hardware support for misaligned loads and stores]))
-AS_IF([test "x$enable_misaligned" = "xyes"], [
-  AC_DEFINE([RISCV_ENABLE_MISALIGNED],,[Enable hardware support for misaligned loads and stores])
-])
-
 AC_ARG_ENABLE([dual-endian], AS_HELP_STRING([--enable-dual-endian], [Enable support for running target in either endianness]))
 AS_IF([test "x$enable_dual_endian" = "xyes"], [
   AC_DEFINE([RISCV_ENABLE_DUAL_ENDIAN],,[Enable support for running target in either endianness])