Index: configure.in
===================================================================
--- configure.in        (revision 26470)
+++ configure.in        (working copy)
@@ -1800,7 +1800,7 @@
                             ],
                          [i586*], [
                            : ${LDSHARED="ld -shared"}
-                           DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+                           DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot -L/boot/common/lib"
                            ])
                        : ${LIBPATHENV=LIBRARY_PATH}
                        rb_cv_dlopen=yes ],
Index: ext/nkf/nkf-utf8/nkf.h
===================================================================
--- ext/nkf/nkf-utf8/nkf.h      (revision 26470)
+++ ext/nkf/nkf-utf8/nkf.h      (working copy)
@@ -160,6 +160,11 @@
 # ifndef HAVE_LOCALE_H
 #  define HAVE_LOCALE_H
 # endif
+#elif defined(__HAIKU__)
+# undef HAVE_LANGINFO_H
+# ifndef HAVE_LOCALE_H
+#  define HAVE_LOCALE_H
+# endif
 #elif defined(MSDOS)
 # ifndef HAVE_LOCALE_H
 #  define HAVE_LOCALE_H