diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index ea2604997ee56..4889320b7e1da 100644
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -2,7 +2,9 @@
 #define ZEND_DLEXPORT
 #define ZEND_DLIMPORT
 
+#ifndef NETWARE
 @TOP@
+#endif
 
 #undef uint
 #undef ulong
@@ -10,7 +12,9 @@
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
+#ifndef NETWARE
 @BOTTOM@
+#endif
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
diff --git a/Zend/zend.h b/Zend/zend.h
index 360c8fd2956a7..237a8141bb55f 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -43,6 +43,9 @@
 #ifdef ZEND_WIN32
 # include "zend_config.w32.h"
 # define ZEND_PATHS_SEPARATOR		';'
+#elif defined(NETWARE)
+# include "zend_config.nw.h"
+# include "acconfig.h"
 #elif defined(__riscos__)
 # include "zend_config.h"
 # define ZEND_PATHS_SEPARATOR		';'
@@ -118,7 +121,7 @@ char *alloca ();
 # endif
 #endif
 
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE))
 # define do_alloca(p) alloca(p)
 # define free_alloca(p)
 #else
diff --git a/Zend/zend_config.nw.h b/Zend/zend_config.nw.h
new file mode 100644
index 0000000000000..ad7dec1376d33
--- /dev/null
+++ b/Zend/zend_config.nw.h
@@ -0,0 +1,79 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2002 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_CONFIG_NW_H
+#define ZEND_CONFIG_NW_H
+
+
+#include <string.h>
+#include <float.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+#define HAVE_ALLOCA 1
+#define HAVE_LIMITS_H 1
+/* #include <malloc.h> */
+
+#define HAVE_STRING_H 1
+
+#undef HAVE_KILL
+#define HAVE_GETPID 1
+/* #define HAVE_ALLOCA_H 1 */
+#define HAVE_MEMCPY 1
+#define HAVE_STRDUP 1
+#define HAVE_SYS_TYPES_H 1
+/* #define HAVE_STDIOSTR_H 1 */
+#define HAVE_CLASS_ISTDIOSTREAM
+#define istdiostream stdiostream
+#define HAVE_STDARG_H	1
+#define HAVE_DLFCN_H	1
+/* #define HAVE_LIBDL 1 */
+#define HAVE_SNPRINTF	1
+#define HAVE_VSNPRINTF	1
+
+/*
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define zend_isinf(a)	0
+#define zend_finite(x)	_finite(x)
+#define zend_isnan(x)	_isnan(x)
+*/
+
+#define zend_sprintf sprintf
+
+/* This will cause the compilation process to be MUCH longer, but will generate
+ * a much quicker PHP binary
+ */
+/* 
+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+*/
+
+/*
+#define zend_finite(A) _finite(A)
+#define zend_isnan(A) _isnan(A)
+*/
+
+#endif /* ZEND_CONFIG_NW_H */