diff --git a/configure b/configure
index 2578eec..b087dee 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ClamAV 0.98.4-rc1.
+# Generated by GNU Autoconf 2.69 for ClamAV 0.98.4.
 #
 # Report bugs to <http://bugs.clamav.net/>.
 #
@@ -592,8 +592,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ClamAV'
 PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='0.98.4-rc1'
-PACKAGE_STRING='ClamAV 0.98.4-rc1'
+PACKAGE_VERSION='0.98.4'
+PACKAGE_STRING='ClamAV 0.98.4'
 PACKAGE_BUGREPORT='http://bugs.clamav.net/'
 PACKAGE_URL='http://www.clamav.net/'
 
@@ -1463,7 +1463,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ClamAV 0.98.4-rc1 to adapt to many kinds of systems.
+\`configure' configures ClamAV 0.98.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1534,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ClamAV 0.98.4-rc1:";;
+     short | recursive ) echo "Configuration of ClamAV 0.98.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1696,7 +1696,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ClamAV configure 0.98.4-rc1
+ClamAV configure 0.98.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2165,7 +2165,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ClamAV $as_me 0.98.4-rc1, which was
+It was created by ClamAV $as_me 0.98.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3286,7 +3286,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='clamav'
- VERSION='0.98.4-rc1'
+ VERSION='0.98.4'
 
 
 # Some tools Automake needs.
@@ -4881,7 +4881,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 
 
-VERSION="0.98.4-rc1"
+VERSION="0.98.4"
 
 LC_CURRENT=7
 LC_REVISION=23
@@ -4889,6 +4889,8 @@ LC_AGE=1
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
 
 
+major=`expr $LC_CURRENT - $LC_AGE`
+
 
 cat >>confdefs.h <<_ACEOF
 #define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"
@@ -16677,15 +16679,21 @@ then
     as_fn_error $? "OpenSSL not found." "$LINENO" 5
 fi
 
-SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
-SSL_LIBS="-lssl -lcrypto"
-SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
-
 save_LDFLAGS="$LDFLAGS"
-LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
-
 save_CFLAGS="$CFLAGS"
-CFLAGS="$SSL_CPPFLAGS"
+save_LIBS="$LIBS"
+
+SSL_LIBS="-lssl -lcrypto"
+
+if test "$LIBSSL_HOME" != "/usr"; then
+    SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
+    SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
+    LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
+    CFLAGS="$SSL_CPPFLAGS"
+else
+    SSL_LDFLAGS=""
+    SSL_CPPFLAGS=""
+fi
 
 have_ssl="no"
 have_crypto="no"
@@ -16776,8 +16784,57 @@ else
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_new in -lssl" >&5
+$as_echo_n "checking for X509_VERIFY_PARAM_new in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_X509_VERIFY_PARAM_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char X509_VERIFY_PARAM_new ();
+int
+main ()
+{
+return X509_VERIFY_PARAM_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=yes
+else
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&5
+$as_echo "$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&6; }
+if test "x$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
+else
+  as_fn_error $? "Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL." "$LINENO" 5
+fi
+
+
 LDFLAGS="$save_LDFLAGS"
 CFLAGS="$save_CFLAGS"
+LIBS="$save_LIBS"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -21916,12 +21973,17 @@ else
         CURL_LDFLAGS=$($LIBCURL_HOME/bin/curl-config --libs)
         CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
     else
-        CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
-        CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
+        if test "$LIBCURL_HOME" != "/usr"; then
+            CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
+            CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
+        else
+            CURL_LDFLAGS="-lcurl"
+            CURL_CPPFLAGS=""
+        fi
     fi
 
     save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
+    LDFLAGS="$CURL_LDFLAGS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
 $as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
 if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
@@ -22611,7 +22673,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ClamAV $as_me 0.98.4-rc1, which was
+This file was extended by ClamAV $as_me 0.98.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22678,7 +22740,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ClamAV config.status 0.98.4-rc1
+ClamAV config.status 0.98.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25245,7 +25307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ClamAV $as_me 0.98.4-rc1, which was
+This file was extended by ClamAV $as_me 0.98.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25312,7 +25374,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ClamAV config.status 0.98.4-rc1
+ClamAV config.status 0.98.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"