diff --git a/configure b/configure
index 94df4fba2..ce8221d66 100755
--- a/configure
+++ b/configure
@@ -15223,16 +15223,7 @@ $as_echo "#define USE_GOST 1" >>confdefs.h
 	;;
 	no)
 	;;
-	*) 	ac_fn_c_check_func "$LINENO" "EVP_PKEY_set_type_str" "ac_cv_func_EVP_PKEY_set_type_str"
-if test "x$ac_cv_func_EVP_PKEY_set_type_str" = x""yes; then :
-
-	  use_gost="yes"
-
-$as_echo "#define USE_GOST 1" >>confdefs.h
-
-fi
-
-	;;
+	*) 	;;
 esac
 
 # check for libevent
diff --git a/configure.ac b/configure.ac
index 6aad73dac..33768a842 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,9 +429,10 @@ case "$enable_gost" in
 	no)
 	;;
 	*) dnl default
-	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [
-	  use_gost="yes"
-	  AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])])
+dnl   Disabled-by-default, RFC not ready.
+dnl	AC_CHECK_FUNC(EVP_PKEY_set_type_str, [
+dnl	  use_gost="yes"
+dnl	  AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])])
 	;;
 esac
 
diff --git a/doc/Changelog b/doc/Changelog
index ffde9240b..08f184c74 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 2 June 2010: Wouter
 	- Fix compile warning if compiled without threads.
 	- updated ldns-tarball with current ldns svn (pre 1.6.5).
+	- GOST disabled-by-default, the algorithm number is allocated but the
+	  RFC is still has to pass AUTH48 at the IETF.
 
 1 June 2010: Wouter
 	- Ignore Z flag in incoming messages too.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 241f027e1..c36d810fd 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ