diff --git a/include/winpr/string.h b/include/winpr/string.h
index 7dc875a98..eb311908e 100644
--- a/include/winpr/string.h
+++ b/include/winpr/string.h
@@ -49,6 +49,8 @@ WINPR_API WCHAR* _wcsdup(const WCHAR* strSource);
 
 WINPR_API int _stricmp(const char* string1, const char* string2);
 
+WINPR_API char* strtok_s(char* strToken, const char* strDelimit, char** context);
+
 WINPR_API LPSTR CharUpperA(LPSTR lpsz);
 WINPR_API LPWSTR CharUpperW(LPWSTR lpsz);
 
diff --git a/winpr/crt/string.c b/winpr/crt/string.c
index 74bf43bfd..a8472e80f 100644
--- a/winpr/crt/string.c
+++ b/winpr/crt/string.c
@@ -70,6 +70,11 @@ int _stricmp(const char* string1, const char* string2)
 	return strcasecmp(string1, string2);
 }
 
+char* strtok_s(char* strToken, const char* strDelimit, char** context)
+{
+	return strtok_r(strToken, strDelimit, context);
+}
+
 /* Windows API Sets - api-ms-win-core-string-l2-1-0.dll
  * http://msdn.microsoft.com/en-us/library/hh802935/
  */
diff --git a/winpr/registry/registry_reg.c b/winpr/registry/registry_reg.c
index feeab5684..65246d6d6 100644
--- a/winpr/registry/registry_reg.c
+++ b/winpr/registry/registry_reg.c
@@ -205,7 +205,7 @@ void reg_insert_key(Reg* reg, RegKey* key, RegKey* subkey)
 
 	path = _strdup(subkey->name);
 
-	name = strtok_r(path, "\\", &save);
+	name = strtok_s(path, "\\", &save);
 
 	while (name != NULL)
 	{
@@ -216,7 +216,7 @@ void reg_insert_key(Reg* reg, RegKey* key, RegKey* subkey)
 			subkey->subname = _strdup(name);
 		}
 
-		name = strtok_r(NULL, "\\", &save);
+		name = strtok_s(NULL, "\\", &save);
 	}
 
 	free(path);