diff --git a/libc/Makefile b/libc/Makefile
index b955dc41..1cc70b9a 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -95,6 +95,7 @@ sort.o \
 sprint.o \
 sscanf.o \
 stpcpy.o \
+stpncpy.o \
 strcasecmp.o \
 strcat.o \
 strchrnul.o \
diff --git a/libc/include/string.h b/libc/include/string.h
index 4e064cf7..cf22cbb6 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -40,6 +40,7 @@ void* memcpy(void* restrict, const void* restrict, size_t);
 void* memmove(void*, const void*, size_t);
 void* memset(void*, int, size_t);
 char* stpcpy(char* restrict, const char* restrict);
+char* stpncpy(char* restrict, const char* restrict, size_t);
 char* strcat(char* restrict, const char* restrict);
 char* strchr(const char*, int);
 int strcmp(const char*, const char*);
@@ -62,7 +63,6 @@ char* strtok_r(char* restrict, const char* restrict, char** restrict);
 /* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 void* memccpy(void* restrict, const void* restrict, int, size_t);
-char* stpncpy(char* restrict, const char* restrict, size_t);
 int strcoll_l(const char*, const char*, locale_t);
 char* strerror_l(int, locale_t);
 int strerror_r(int, char*, size_t);
diff --git a/libc/stpncpy.cpp b/libc/stpncpy.cpp
new file mode 100644
index 00000000..ba88e7c0
--- /dev/null
+++ b/libc/stpncpy.cpp
@@ -0,0 +1,36 @@
+/*******************************************************************************
+
+	Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
+
+	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 <http://www.gnu.org/licenses/>.
+
+	stpncpy.cpp
+	Copies a string into a fixed size buffer and returns last byte.
+
+*******************************************************************************/
+
+#include <string.h>
+
+extern "C" char* stpncpy(char* dest, const char* src, size_t n)
+{
+	size_t i;
+	for ( i = 0; i < n && src[i] != '\0'; i++ )
+		dest[i] = src[i];
+	char* ret = dest + i;
+	for ( ; i < n; i++ )
+		dest[i] = '\0';
+	return ret;
+}