diff --git a/libc/Makefile b/libc/Makefile
index ba50ab99..488f460b 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -192,6 +192,7 @@ wchar/wcspbrk.o \
wchar/wcsrchr.o \
wchar/wcsrtombs.o \
wchar/wcsspn.o \
+wchar/wcsstr.o \
wchar/wcstok.o \
wchar/wcstoll.o \
wchar/wcstol.o \
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index 5d8fd8a1..2f2ac21b 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -80,6 +80,7 @@ wchar_t* wcspbrk(const wchar_t*, const wchar_t*);
wchar_t* wcsrchr(const wchar_t*, wchar_t);
size_t wcsrtombs(char* __restrict, const wchar_t** __restrict, size_t, mbstate_t* __restrict);
size_t wcsspn(const wchar_t*, const wchar_t*);
+wchar_t* wcsstr(const wchar_t* __restrict, const wchar_t* __restrict);
wchar_t* wcstok(wchar_t* __restrict, const wchar_t* __restrict, wchar_t** __restrict);
long long wcstoll(const wchar_t* __restrict, wchar_t** __restrict, int);
long wcstol(const wchar_t* __restrict, wchar_t** __restrict, int);
@@ -114,8 +115,6 @@ int wscanf(const wchar_t* __restrict, ...);
long double wcstold(const wchar_t* __restrict, wchar_t** __restrict);
size_t wcsftime(wchar_t* __restrict, size_t, const wchar_t* __restrict, const struct tm* __restrict);
wchar_t* fgetws(wchar_t* __restrict, int, FILE* __restrict);
-wchar_t* wcsstr(const wchar_t* __restrict, const wchar_t* __restrict);
-wchar_t* wcswcs(const wchar_t*, const wchar_t*);
wchar_t* wmemchr(const wchar_t*, wchar_t, size_t);
wchar_t* wmemcpy(wchar_t* __restrict, const wchar_t* __restrict, size_t);
wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t);
diff --git a/libc/wchar/wcsstr.cpp b/libc/wchar/wcsstr.cpp
new file mode 100644
index 00000000..b4ca8379
--- /dev/null
+++ b/libc/wchar/wcsstr.cpp
@@ -0,0 +1,48 @@
+/*******************************************************************************
+
+ Copyright(C) Jonas 'Sortie' Termansen 2013.
+
+ This file is part of the Sortix C Library.
+
+ The Sortix C Library is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ The Sortix C Library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with the Sortix C Library. If not, see .
+
+ wchar/wcsstr.cpp
+ Locate a wide substring.
+
+*******************************************************************************/
+
+#include
+
+// TODO: This simple and hacky implementation runs in O(N^2) even though this
+// problem can be solved in O(N).
+extern "C"
+wchar_t* wcsstr(const wchar_t* restrict haystack,
+ const wchar_t* restrict needle)
+{
+ if ( !needle[0] )
+ return (wchar_t*) haystack;
+ for ( size_t i = 0; haystack[i]; i++ )
+ {
+ bool diff = false;
+ for ( size_t j = 0; needle[j]; j++ )
+ {
+ if ( (diff = haystack[i+j] != needle[j]) )
+ break;
+ }
+ if ( diff )
+ continue;
+ return (wchar_t*) haystack + i;
+ }
+ return NULL;
+}