diff --git a/daemon/daemon.c b/daemon/daemon.c
index e763f724e..adb936a4f 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -656,7 +656,6 @@ daemon_delete(struct daemon* daemon)
 	CONF_modules_free();
 #  endif
 	CRYPTO_cleanup_all_ex_data(); /* safe, no more threads right now */
-	ERR_remove_state(0);
 	ERR_free_strings();
 	RAND_cleanup();
 #  if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
diff --git a/doc/Changelog b/doc/Changelog
index a627b1436..938c1656b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix test for openssl to use HMAC_Update for 1.1.0.
 	- acx_nlnetlabs.m4 to v33, with HMAC_Update.
 	- acx_nlnetlabs.m4 to v34, with -ldl -pthread test for libcrypto.
+	- ERR_remove_state deprecated since openssl 1.0.0.
 
 18 March 2016: Ralph
 	- Validate QNAME minimised NXDOMAIN responses.
diff --git a/testcode/petal.c b/testcode/petal.c
index a54181c37..269b109b8 100644
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@ -642,7 +642,6 @@ int main(int argc, char* argv[])
 	do_service(addr, port, key, cert);
 
 	CRYPTO_cleanup_all_ex_data();
-	ERR_remove_state(0);
 	ERR_free_strings();
 	RAND_cleanup();
 	return 0;
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 0b32dcd86..eb83066b8 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -602,7 +602,6 @@ main(int argc, char* argv[])
 	CONF_modules_free();
 #  endif
 	CRYPTO_cleanup_all_ex_data();
-	ERR_remove_state(0);
 	ERR_free_strings();
 	RAND_cleanup();
 #elif defined(HAVE_NSS)