diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp
index d7751816..5b1a657e 100644
--- a/Contrib/BgImage/BgImage.cpp
+++ b/Contrib/BgImage/BgImage.cpp
@@ -102,6 +102,7 @@ extern "C" void __declspec(dllexport) SetImage(HWND hwndParent, int string_size,
 
 extern "C" void __declspec(dllexport) Destroy(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
   SendMessage(hWndImage, WM_CLOSE, 0, 0);
+  UnregisterClass("NSISBGImage", g_hInstance);
 }
 
 extern "C" void __declspec(dllexport) Sound(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
diff --git a/Contrib/Splash/splash.c b/Contrib/Splash/splash.c
index 5220363e..a3a63b8e 100644
--- a/Contrib/Splash/splash.c
+++ b/Contrib/Splash/splash.c
@@ -109,6 +109,8 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, char *variable
 
         DeleteObject(g_hbm);
 
+        UnregisterClass(classname, g_hInstance);
+
       }
     }
   }
diff --git a/Plugins/BgImage.dll b/Plugins/BgImage.dll
index 47d1c66f..8970e098 100644
Binary files a/Plugins/BgImage.dll and b/Plugins/BgImage.dll differ
diff --git a/Plugins/splash.dll b/Plugins/splash.dll
index b599130b..437446ca 100644
Binary files a/Plugins/splash.dll and b/Plugins/splash.dll differ