diff --git a/lang/neko/files/patch-libs_mod_tora_protocol.c b/lang/neko/files/patch-libs_mod_tora_protocol.c
new file mode 100644
index 000000000000..ba1c4fd68676
--- /dev/null
+++ b/lang/neko/files/patch-libs_mod_tora_protocol.c
@@ -0,0 +1,49 @@
+--- libs/mod_tora/protocol.c.orig	2009-06-19 17:15:56.000000000 +0900
++++ libs/mod_tora/protocol.c	2009-06-19 17:17:33.000000000 +0900
+@@ -37,7 +37,7 @@
+ 			cursor++; \
+ 	}
+ 
+-static int pwrite( mcontext *c, const char *buf, int len ) {
++static int _pwrite( mcontext *c, const char *buf, int len ) {
+ 	while( len > 0 ) {
+ 		int k = send(c->sock,buf,len,MSG_NOSIGNAL);
+ 		if( k <= 0 ) return 0;
+@@ -47,7 +47,7 @@
+ 	return 1;
+ }
+ 
+-static int pread( mcontext *c, char *buf, int len ) {
++static int _pread( mcontext *c, char *buf, int len ) {
+ 	while( len > 0 ) {
+ 		int k = recv(c->sock,buf,len,MSG_NOSIGNAL);
+ 		if( k <= 0 ) return 0;
+@@ -63,8 +63,8 @@
+ 	h[1] = (unsigned char)len;
+ 	h[2] = (unsigned char)(len >> 8);
+ 	h[3] = (unsigned char)(len >> 16);
+-	pwrite(c,(char*)h,4);
+-	pwrite(c,str,len);
++	_pwrite(c,(char*)h,4);
++	_pwrite(c,str,len);
+ }
+ 
+ static void psend( mcontext *c, proto_code code, const char *str ) {
+@@ -329,7 +329,7 @@
+ 	int buflen = BUFSIZE;
+ 	*exc = 0;
+ 	while( true ) {
+-		if( !pread(c,header,4) )
++		if( !_pread(c,header,4) )
+ 			ABORT("Connection Closed");
+ 		len = header[1] | (header[2] << 8) | (header[3] << 16);
+ 		if( buflen <= len ) {
+@@ -338,7 +338,7 @@
+ 			free(buf);
+ 			buf = (char*)malloc(buflen);
+ 		}
+-		if( !pread(c,buf,len) )
++		if( !_pread(c,buf,len) )
+ 			ABORT("Connection Closed");
+ 		buf[len] = 0;
+ 		switch( *header ) {
diff --git a/lang/neko/files/patch-libs_std_process.c b/lang/neko/files/patch-libs_std_process.c
new file mode 100644
index 000000000000..630efc7aed6f
--- /dev/null
+++ b/lang/neko/files/patch-libs_std_process.c
@@ -0,0 +1,11 @@
+--- libs/std/process.c.orig	2009-06-19 00:08:00.000000000 +0900
++++ libs/std/process.c	2009-06-19 00:08:06.000000000 +0900
+@@ -23,7 +23,7 @@
+ #	include <unistd.h>
+ #	include <errno.h>
+ #	ifndef NEKO_MAC
+-#		include <wait.h>
++#		include <sys/wait.h>
+ #	endif
+ #endif
+ 
diff --git a/lang/neko/files/patch-libs_std_sys.c b/lang/neko/files/patch-libs_std_sys.c
new file mode 100644
index 000000000000..118ae4f4c569
--- /dev/null
+++ b/lang/neko/files/patch-libs_std_sys.c
@@ -0,0 +1,22 @@
+--- libs/std/sys.c.orig	2009-06-19 00:08:19.000000000 +0900
++++ libs/std/sys.c	2009-06-19 00:11:42.000000000 +0900
+@@ -35,7 +35,9 @@
+ #	include <termios.h>
+ #	include <sys/time.h>
+ #	include <sys/times.h>
++#ifndef __FreeBSD__
+ #	include <xlocale.h>
++#endif
+ #endif
+ 
+ #ifdef NEKO_MAC
+@@ -123,6 +125,9 @@
+ 	<doc>Set the locale for LC_TIME, returns true on success</doc>
+ **/
+ static value set_time_locale( value l ) {
++#ifdef __FreeBSD__
++#undef NEKO_POSIX
++#endif
+ #ifdef NEKO_POSIX
+ 	locale_t lc, old;
+ 	val_check(l,string);