diff --git a/configure.in b/configure.in
index fdf3ce341f..d2fc9db546 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,7 @@ case "$target" in
     SHRLIB_EXT=so
     ;;
 
-  *-*-linux*)
+  i*86*-*-linux*)
     MAKEFILE_PREFIX=linux
     PLATFORM=LINUX
     AC_DEFINE(LINUX)
@@ -84,6 +84,16 @@ case "$target" in
     SHRLIB_EXT=so
     ;;
 
+  *-*-linux*)
+    MAKEFILE_PREFIX=linux_generic
+    INSTALL_PREFIX=linux
+    PLATFORM=LINUX
+    AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
+    LOCK_MANAGER_FLG=Y
+    EDITLINE_FLG=Y
+    SHRLIB_EXT=so
+    ;;
+
   *-*-netbsd*)
     MAKEFILE_PREFIX=netbsd
     PLATFORM=NETBSD