diff --git a/configure b/configure
index 697d4347b..b8bdae6dc 100755
--- a/configure
+++ b/configure
@@ -17759,6 +17759,79 @@ fi
 
 case "$enable_gost" in
 	yes)
+	{ $as_echo "$as_me:$LINENO: checking for EVP_PKEY_set_type_str in -lcrypto" >&5
+$as_echo_n "checking for EVP_PKEY_set_type_str in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_EVP_PKEY_set_type_str+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 EVP_PKEY_set_type_str ();
+int
+main ()
+{
+return EVP_PKEY_set_type_str ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_crypto_EVP_PKEY_set_type_str=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_crypto_EVP_PKEY_set_type_str=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_EVP_PKEY_set_type_str" >&5
+$as_echo "$ac_cv_lib_crypto_EVP_PKEY_set_type_str" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_PKEY_set_type_str" = x""yes; then
+
+else
+  { { $as_echo "$as_me:$LINENO: error: OpenSSL >= 1.0.0 is needed for GOST support" >&5
+$as_echo "$as_me: error: OpenSSL >= 1.0.0 is needed for GOST support" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_GOST 1
diff --git a/configure.ac b/configure.ac
index 63cd329cc..950a226dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,7 @@ esac
 AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support, experimental]))
 case "$enable_gost" in
 	yes)
+	AC_CHECK_LIB(crypto, EVP_PKEY_set_type_str, [ ],[AC_MSG_ERROR([OpenSSL >= 1.0.0 is needed for GOST support])])
 	AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])
 	;;
 	no|*)
diff --git a/doc/Changelog b/doc/Changelog
index 530e9f247..bfaa1fe49 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+11 August 2009: Wouter
+	- Check for openssl compatible with gost if enabled.
+
 7 August 2009: Wouter
 	- call OPENSSL_config() in unbound and unit test so that the
 	  operator can use openssl.cnf for configuration options.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index dcd34f436..b93d1f70a 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ