diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index df47fe797a..e912a4047e 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9869,7 +9869,7 @@ zone_refreshkeys(dns_zone_t *zone) {
 		 */
 
 #ifdef ENABLE_AFL
-                if (dns_fuzzing_resolver == ISC_FALSE) {
+		if (dns_fuzzing_resolver == ISC_FALSE) {
 #endif
 		result = dns_resolver_createfetch(zone->view->resolver,
 						  kname, dns_rdatatype_dnskey,
@@ -9883,9 +9883,9 @@ zone_refreshkeys(dns_zone_t *zone) {
 						  &kfetch->dnskeysigset,
 						  &kfetch->fetch);
 #ifdef ENABLE_AFL
-                } else {
-                        result = ISC_R_FAILURE;
-                }
+		} else {
+			result = ISC_R_FAILURE;
+		}
 #endif
 		if (result == ISC_R_SUCCESS)
 			fetching = ISC_TRUE;
diff --git a/lib/isc/openssl_shim.c b/lib/isc/openssl_shim.c
index e53a506674..96455fc204 100644
--- a/lib/isc/openssl_shim.c
+++ b/lib/isc/openssl_shim.c
@@ -91,5 +91,5 @@ int HMAC_CTX_reset(HMAC_CTX *ctx) {
 	HMAC_CTX_cleanup(ctx);
 	return 1;
 }
-		
+
 #endif
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 7005544ff8..b9eb914928 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -636,8 +636,8 @@ cfg_parse_buffer3(cfg_parser_t *pctx, isc_buffer_t *buffer,
 
 isc_result_t
 cfg_parse_buffer4(cfg_parser_t *pctx, isc_buffer_t *buffer,
-                  const char *file, unsigned int line,
-                  const cfg_type_t *type, unsigned int flags,
+		  const char *file, unsigned int line,
+		  const cfg_type_t *type, unsigned int flags,
 		  cfg_obj_t **ret)
 {
 	isc_result_t result;
@@ -1728,19 +1728,19 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 		    (clause->flags & CFG_CLAUSEFLAG_DEPRECATED) != 0)
 		{
 			cfg_parser_warning(pctx, 0, "option '%s' is deprecated",
-				           clause->name);
+					   clause->name);
 		}
 		if ((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) {
 			cfg_parser_warning(pctx, 0, "option '%s' is obsolete",
-				           clause->name);
+					   clause->name);
 		}
 		if ((clause->flags & CFG_CLAUSEFLAG_NOTIMP) != 0) {
 			cfg_parser_warning(pctx, 0, "option '%s' is "
-				           "not implemented", clause->name);
+					   "not implemented", clause->name);
 		}
 		if ((clause->flags & CFG_CLAUSEFLAG_NYI) != 0) {
 			cfg_parser_warning(pctx, 0, "option '%s' is "
-				           "not implemented", clause->name);
+					   "not implemented", clause->name);
 		}
 		if ((clause->flags & CFG_CLAUSEFLAG_NOOP) != 0) {
 			cfg_parser_warning(pctx, 0, "option '%s' was not "
diff --git a/util/copyrights b/util/copyrights
index 0750f5dfcc..3759639638 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -242,10 +242,6 @@
 ./bin/pkcs11/.gitignore				X	2014,2018
 ./bin/pkcs11/Makefile.in			MAKE	2009,2012,2014,2015,2016,2017,2018
 ./bin/pkcs11/OLD-PKCS11-NOTES			X	2009,2018
-./bin/pkcs11/openssl-0.9.8zh-patch		X	2015,2018
-./bin/pkcs11/openssl-1.0.0t-patch		X	2015,2018
-./bin/pkcs11/openssl-1.0.1t-patch		X	2016,2018
-./bin/pkcs11/openssl-1.0.2h-patch		X	2016,2018
 ./bin/pkcs11/pkcs11-destroy.8			MAN	DOCBOOK
 ./bin/pkcs11/pkcs11-destroy.c			X	2009,2010,2014,2015,2018
 ./bin/pkcs11/pkcs11-destroy.docbook		SGML	2009,2014,2015,2016,2018
@@ -3646,6 +3642,8 @@
 ./lib/isc/nothreads/include/isc/thread.h	C	2000,2001,2004,2007,2013,2016,2017,2018
 ./lib/isc/nothreads/mutex.c			C	2000,2001,2004,2006,2007,2016,2018
 ./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007,2016,2017,2018
+./lib/isc/openssl_shim.c			C	2018
+./lib/isc/openssl_shim.h			C	2018
 ./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007,2012,2016,2018
 ./lib/isc/pk11.c				C	2014,2015,2016,2017,2018
 ./lib/isc/pk11_result.c				C	2014,2015,2016,2018