diff --git a/Makefile b/Makefile
index af24c84..5f2c0bb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ TOPDIR ?= $(CURDIR)
 include $(TOPDIR)/share/wups_rules
 
 export WUPS_MAJOR	:=	0
-export WUPS_MINOR	:=	8
-export WUPS_PATCH	:=	2
+export WUPS_MINOR	:=	9
+export WUPS_PATCH	:=	0
 
 VERSION	:=	$(WUPS_MAJOR).$(WUPS_MINOR).$(WUPS_PATCH)
 
diff --git a/include/wups/hooks.h b/include/wups/hooks.h
index 1a52b13..3b1e090 100644
--- a/include/wups/hooks.h
+++ b/include/wups/hooks.h
@@ -62,6 +62,7 @@ typedef enum wups_loader_hook_type_t {
     WUPS_LOADER_HOOK_INIT_STORAGE,      /* Only for internal usage */
     WUPS_LOADER_HOOK_INIT_CONFIG,       /* Only for internal usage */
     WUPS_LOADER_HOOK_INIT_BUTTON_COMBO, /* Only for internal usage */
+    WUPS_LOADER_HOOK_INIT_WUT_THREAD,   /* Only for internal usage */
 } wups_loader_hook_type_t;
 
 typedef struct wups_loader_hook_t {
@@ -180,15 +181,20 @@ typedef struct wups_loader_hook_t {
 #define WUPS_USE_WUT_STDCPP()                                           \
     __EXTERN_C_MACRO void __init_wut_stdcpp();                          \
     void on_init_wut_stdcpp() {                                         \
-        __init_wut_stdcpp();                                            \
     }                                                                   \
     WUPS_HOOK_EX(WUPS_LOADER_HOOK_INIT_WUT_STDCPP, on_init_wut_stdcpp); \
     __EXTERN_C_MACRO void __fini_wut_stdcpp();                          \
     void on_fini_wut_stdcpp() {                                         \
-        __fini_wut_stdcpp();                                            \
     }                                                                   \
     WUPS_HOOK_EX(WUPS_LOADER_HOOK_FINI_WUT_STDCPP, on_fini_wut_stdcpp)
 
+#define WUPS_USE_WUT_THREAD()                  \
+    __EXTERN_C_MACRO void __init_wut_thread(); \
+    void on_init_wut_thread() {                \
+        __init_wut_thread();                   \
+    }                                          \
+    WUPS_HOOK_EX(WUPS_LOADER_HOOK_INIT_WUT_THREAD, on_init_wut_thread);
+
 #ifdef __cplusplus
 extern "C" uint32_t __attribute__((weak)) wut_get_thread_specific(int id);
 extern "C" const char wups_meta_info_linking_order[];
diff --git a/include/wups/meta.h b/include/wups/meta.h
index 418b459..a392447 100644
--- a/include/wups/meta.h
+++ b/include/wups/meta.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#define WUPS_VERSION_STR "0.8.2"
+#define WUPS_VERSION_STR "0.9.0"
 #define WUPS_PLUGIN_NAME(__plugin_name)                                                                             \
     WUPS_META(name, __plugin_name);                                                                                 \
     WUPS_META(wups, WUPS_VERSION_STR);                                                                              \
@@ -46,6 +46,7 @@ extern "C" {
     WUPS_USE_WUT_SOCKETS();                                                                                         \
     WUPS_USE_WUT_NEWLIB();                                                                                          \
     WUPS_USE_WUT_STDCPP();                                                                                          \
+    WUPS_USE_WUT_THREAD();                                                                                          \
     WUPS___INIT_WRAPPER();                                                                                          \
     WUPS___FINI_WRAPPER();                                                                                          \
     WUPS_INIT_CONFIG_FUNCTIONS();                                                                                   \