diff --git a/AUTHORS b/AUTHORS
index e429b931..ccbc56d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Dhammika Pathirana <dhammika@gmail.com>
 Dhruva Krishnamurthy <dhruva@ymail.com>
 Dirk O. Kaar <dok@dok-net.net>
 Douglas Creager <douglas.creager@redjack.com>
+Drew Crawford <drew@sealedabstract.com>
 Erich Heine <sophacles@gmail.com>
 Erik Hugne <erik.hugne@ericsson.com>
 Erik Rigtorp <erik@rigtorp.com>
diff --git a/configure.ac b/configure.ac
index a258bf09..963a6ead 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,7 +299,12 @@ esac
 # Checks for libraries
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
+if test "x$zmq_search_libsodium" = "xyes"; then
+    AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_ERROR(libsodium is not installed.  Install it or don't pass --with-libsodium to configure script))
+else
+    AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
+fi
+
 
 #
 # Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec