diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bf509b6c50..488226077a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/22032
+	* opncls.c (bfd_close_all_done): Call _close_and_cleanup.
+
 2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf64-x86-64.c (elf_x86_64_next_tls_desc_index): Removed.
diff --git a/bfd/opncls.c b/bfd/opncls.c
index 913341c9ff..b99ae728c0 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -776,6 +776,9 @@ bfd_close_all_done (bfd *abfd)
 
   ret = bfd_cache_close (abfd);
 
+  if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
+    return FALSE;
+
   if (ret)
     _maybe_make_executable (abfd);