diff --git a/CHANGELOG b/CHANGELOG
index fdec0338e..d334f7d8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,12 @@ o Since assert() calls are used for various security-related tests,
   their safety is now ensured by keeping NDEBUG undefined throughout
   Nmap, Nbase and Nsock. [Kris]
 
+o Fix a couple bugs in the way the Nmap built system checked for an
+  existing LUA library.  A bashism caused one test to fail on system
+  which don't use bash as /bin/sh, and another bug fixed --with-liblua
+  configure option for specifying your own liblua. [Daniel
+  Roethlisberger]
+
 Nmap 4.62 [5/3/08]
 
 o Added a new --min-rate option that allows specifying a minimum rate
diff --git a/configure b/configure
index 5d9f4d847..5892765b0 100755
--- a/configure
+++ b/configure
@@ -7181,7 +7181,6 @@ if test "${with_liblua+set}" = set; then
   *)
     CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
     LDFLAGS="-L$with_liblua/lib $LDFLAGS"
-    have_lua=yes
   ;;
   esac
 
@@ -7189,7 +7188,7 @@ fi
 
 
 # They don't want lua
-if test $no_lua == yes; then
+if test "$no_lua" = "yes"; then
   CXXFLAGS="-DNOLUA $CXXFLAGS"
   LIBLUA_LIBS=""
   LUA_DEPENDS=""
diff --git a/configure.ac b/configure.ac
index 9e5bf616e..c3371a793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,13 +493,12 @@ AC_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
   *)
     CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
     LDFLAGS="-L$with_liblua/lib $LDFLAGS"
-    have_lua=yes
   ;;
   esac]
 )
 
 # They don't want lua
-if test $no_lua == yes; then
+if test "$no_lua" = "yes"; then
   CXXFLAGS="-DNOLUA $CXXFLAGS"
   LIBLUA_LIBS=""
   LUA_DEPENDS=""