diff --git a/HISTORY b/HISTORY
index 88b66e7a..b475e674 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9078,3 +9078,4 @@ Video Disk Recorder Revision History
   the $(Q) macro won't be defined and commands will be displayed. You can add
   Q=@ to the make call to have it less verbose (provided the plugin's Makefile
   was modified as described above).
+- Added clearing CiResourceHandlers before shutting down the plugin manager.
diff --git a/vdr.c b/vdr.c
index 41dbc8f4..ea6a0cfb 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.14 2017/05/21 12:31:37 kls Exp $
+ * $Id: vdr.c 4.15 2017/05/29 11:10:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -1585,6 +1585,7 @@ Exit:
   cVideoDirectory::Destroy();
   EpgHandlers.Clear();
   cSchedules::Cleanup(true);
+  CiResourceHandlers.Clear();
   ListGarbageCollector.Purge(true);
   PluginManager.Shutdown(true);
   ReportEpgBugFixStats(true);