diff --git a/configure b/configure
index f6f15b24a..697d4347b 100755
--- a/configure
+++ b/configure
@@ -1580,8 +1580,8 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         disable hardcoded rpath (default=enabled)
-  --enable-sha2           Enable SHA256 and SHA512 RRSIG support
-  --enable-gost           Enable GOST support
+  --enable-sha2           Enable SHA256 and SHA512 RRSIG support, experimental
+  --enable-gost           Enable GOST support, experimental
   --enable-static-exe     enable to compile executables statically against
                           event, ldns libs, for debug purposes
   --enable-lock-checks    enable to check lock and unlock calls, for debug
diff --git a/configure.ac b/configure.ac
index 7e2cd69f2..63cd329cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,7 @@ ACX_WITH_SSL
 ACX_LIB_SSL
 AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512])
 
-AC_ARG_ENABLE(sha2, AC_HELP_STRING([--enable-sha2], [Enable SHA256 and SHA512 RRSIG support]))
+AC_ARG_ENABLE(sha2, AC_HELP_STRING([--enable-sha2], [Enable SHA256 and SHA512 RRSIG support, experimental]))
 case "$enable_sha2" in
 	yes)
 	AC_DEFINE([USE_SHA2], [1], [Define this to enable SHA256 and SHA512 support.])
@@ -362,7 +362,7 @@ case "$enable_sha2" in
 	;;
 esac
 
-AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support]))
+AC_ARG_ENABLE(gost, AC_HELP_STRING([--enable-gost], [Enable GOST support, experimental]))
 case "$enable_gost" in
 	yes)
 	AC_DEFINE([USE_GOST], [1], [Define this to enable GOST support.])
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index feeb86894..dcd34f436 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ