diff --git a/src/auto/configure b/src/auto/configure
index 3ef90c8..5244a2e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4737,13 +4737,15 @@
       if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
 	vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
       else
-			for i in 0 1 2 3 4 5 6 7 8 9; do
-	  if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
-	    LUA_SONAME=".$i"
-	    break
-	  fi
+			for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
+	  for i in 0 1 2 3 4 5 6 7 8 9; do
+	    if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
+	      LUA_SONAME=".$i"
+	      break
+	    fi
+	  done
+	  vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
 	done
-	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
       fi
       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
 
diff --git a/src/configure.in b/src/configure.in
index 431bc2c..d0fa6ff 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -496,13 +496,15 @@
       else
 	dnl Determine the SONAME for the current version, but fallback to
 	dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
-	for i in 0 1 2 3 4 5 6 7 8 9; do
-	  if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
-	    LUA_SONAME=".$i"
-	    break
-	  fi
+	for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
+	  for i in 0 1 2 3 4 5 6 7 8 9; do
+	    if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
+	      LUA_SONAME=".$i"
+	      break
+	    fi
+	  done
+	  vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
 	done
-	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
       fi
       AC_DEFINE(DYNAMIC_LUA)
       LUA_LIBS=""
diff --git a/src/version.c b/src/version.c
index 261a032..6981f91 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    805,
+/**/
     804,
 /**/
     803,