diff --git a/ChangeLog b/ChangeLog
index 15eeaf98fd..76eb8654e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 13 10:22:11 2012  Takashi Toyoshima  <toyoshim@gmail.com>
+
+	* configure.in: Don't use PIE on Haiku because loader support is not
+	  enough.
+
 Thu Sep 13 08:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
 
 	* lib/shellwords.rb: Documentation for Shellwords.
diff --git a/configure.in b/configure.in
index 95787f5d85..5131952682 100644
--- a/configure.in
+++ b/configure.in
@@ -2676,7 +2676,13 @@ AS_CASE("$enable_shared", [yes], [
   LIBRUBYARG_SHARED=
 
   # enable PIE if possible
-  if test "$GCC" = yes -a -z "$EXTSTATIC"; then
+  pie=
+  AS_CASE(["$target_os"],
+  [haiku], [
+    # gcc supports PIE, but doesn't work correctly in Haiku
+    pie=no
+  ])
+  if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
     RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
     if test "$pie" = yes; then
       RUBY_APPEND_OPTION(XCFLAGS, -fPIE)