diff -r 459375343313 ext/mbstring/config.m4
--- a/ext/mbstring/config.m4	Thu May 01 13:08:52 2008 +0200
+++ b/ext/mbstring/config.m4	Thu May 01 22:10:33 2008 +0200
@@ -103,56 +103,9 @@
       AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack])
     fi
 
-    PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
-    PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
-    PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
-    PHP_MBSTRING_ADD_INCLUDE([oniguruma])
-    PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])
-
     PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
-    PHP_MBSTRING_ADD_SOURCES([
-      oniguruma/regcomp.c
-      oniguruma/regerror.c
-      oniguruma/regexec.c
-      oniguruma/reggnu.c
-      oniguruma/regparse.c
-      oniguruma/regenc.c
-      oniguruma/regext.c
-      oniguruma/regsyntax.c
-      oniguruma/regtrav.c
-      oniguruma/regversion.c
-      oniguruma/st.c
-      oniguruma/enc/unicode.c
-      oniguruma/enc/ascii.c
-      oniguruma/enc/utf8.c
-      oniguruma/enc/euc_jp.c
-      oniguruma/enc/euc_tw.c
-      oniguruma/enc/euc_kr.c
-      oniguruma/enc/sjis.c
-      oniguruma/enc/iso8859_1.c
-      oniguruma/enc/iso8859_2.c
-      oniguruma/enc/iso8859_3.c
-      oniguruma/enc/iso8859_4.c
-      oniguruma/enc/iso8859_5.c
-      oniguruma/enc/iso8859_6.c
-      oniguruma/enc/iso8859_7.c
-      oniguruma/enc/iso8859_8.c
-      oniguruma/enc/iso8859_9.c
-      oniguruma/enc/iso8859_10.c
-      oniguruma/enc/iso8859_11.c
-      oniguruma/enc/iso8859_13.c
-      oniguruma/enc/iso8859_14.c
-      oniguruma/enc/iso8859_15.c
-      oniguruma/enc/iso8859_16.c
-      oniguruma/enc/koi8.c
-      oniguruma/enc/koi8_r.c
-      oniguruma/enc/big5.c
-      oniguruma/enc/utf16_be.c
-      oniguruma/enc/utf16_le.c
-      oniguruma/enc/utf32_be.c
-      oniguruma/enc/utf32_le.c
-      oniguruma/enc/gb18030.c
-    ])
+    PHP_ADD_LIBRARY_WITH_PATH(onig, $PHP_LIBDIR, MBSTRING_SHARED_LIBADD)
+    PHP_SUBST(MBSTRING_SHARED_LIBADD)
   fi
 ])
 
@@ -302,7 +255,7 @@
   dnl libmbfl is required
   PHP_MBSTRING_SETUP_LIBMBFL
   PHP_MBSTRING_EXTENSION
-  PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h])
+  PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/php_onig_compat.h])
 fi
 
 # vim600: sts=2 sw=2 et
diff -r 459375343313 ext/mbstring/php_mbregex.c
--- a/ext/mbstring/php_mbregex.c	Thu May 01 13:08:52 2008 +0200
+++ b/ext/mbstring/php_mbregex.c	Thu May 01 22:10:33 2008 +0200
@@ -159,10 +159,6 @@
 	{
 		"EUC-KR\0EUCKR\0EUC_KR\0",
 		ONIG_ENCODING_EUC_KR
-	},
-	{
-		"KOI8\0KOI-8\0",
-		ONIG_ENCODING_KOI8
 	},
 	{
 		"KOI8R\0KOI8-R\0KOI-8R\0",
diff -r 459375343313 ext/mbstring/php_mbregex.h
--- a/ext/mbstring/php_mbregex.h	Thu May 01 13:08:52 2008 +0200
+++ b/ext/mbstring/php_mbregex.h	Thu May 01 22:10:33 2008 +0200
@@ -25,7 +25,8 @@
 
 #include "php.h"
 #include "zend.h"
-#include "oniguruma/oniguruma.h"
+#include "oniguruma/php_onig_compat.h"
+#include <oniguruma.h>
 
 /* {{{ PHP_MBREGEX_GLOBALS */
 #define PHP_MBREGEX_GLOBALS \