diff --git a/Source/cmake/OptionsHaiku.cmake b/Source/cmake/OptionsHaiku.cmake
index 7b4d1e0ddd64..2509a8f00cc4 100644
--- a/Source/cmake/OptionsHaiku.cmake
+++ b/Source/cmake/OptionsHaiku.cmake
@@ -183,11 +183,6 @@ if (CMAKE_COMPILER_IS_GNUCC AND "${LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR}" STREQ
     set(CMAKE_CXX_FLAGS "-march=i686 ${CMAKE_CXX_FLAGS}")
 endif()
 
-if (CMAKE_COMPILER_IS_GNUCC AND "${LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-    # GCC port issue? This is not needed for other platforms.
-    set(CMAKE_EXE_LINKER_FLAGS "-pie ${CMAKE_EXE_LINKER_FLAGS}")
-endif()
-
 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER OFF)
 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL OFF)
 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL OFF)
diff --git a/Tools/DumpRenderTree/haiku/DumpRenderTree.cpp b/Tools/DumpRenderTree/haiku/DumpRenderTree.cpp
index 2f142e2649b1..171140307c0f 100644
--- a/Tools/DumpRenderTree/haiku/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/haiku/DumpRenderTree.cpp
@@ -114,6 +114,17 @@ static String dumpFramesAsText(BWebFrame* frame)
         }
     }
 
+    // To keep things tidy, strip all trailing spaces: they are not a meaningful part of dumpAsText test output.
+    size_t spacePosition = String::MaxLength;
+    while ((spacePosition = result.reverseFind(" \n", spacePosition)) != notFound)
+        result.remove(spacePosition, 1);
+    if (!result.isEmpty()) {
+        spacePosition = result.length();
+        while (spacePosition > 0 && result[spacePosition - 1] == ' ')
+            spacePosition--;
+        result.remove(spacePosition, result.length() - spacePosition);
+    }
+
     return result;
 }
 
diff --git a/Tools/Scripts/webkitpy/port/haiku.py b/Tools/Scripts/webkitpy/port/haiku.py
index ca0de6d00e4f..736f067df3af 100644
--- a/Tools/Scripts/webkitpy/port/haiku.py
+++ b/Tools/Scripts/webkitpy/port/haiku.py
@@ -100,7 +100,7 @@ def _search_paths(self):
         return search_paths
 
     def default_baseline_search_path(self, **kwargs):
-        return map(self._webkit_baseline_path, self._search_paths())
+        return list(map(self._webkit_baseline_path, self._search_paths()))
 
     def _port_specific_expectations_files(self, **kwargs):
         return [self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in reversed(self._search_paths())]
diff --git a/Tools/Scripts/webkitpy/port/haiku_get_crash_log.py b/Tools/Scripts/webkitpy/port/haiku_get_crash_log.py
index 9490b2869ea4..a67842ffe695 100644
--- a/Tools/Scripts/webkitpy/port/haiku_get_crash_log.py
+++ b/Tools/Scripts/webkitpy/port/haiku_get_crash_log.py
@@ -38,7 +38,7 @@ def __init__(self, name, pid, newer_than, filesystem, path_to_driver):
     def _get_debugger_output(self, coredump_path):
         result = None
         try:
-            with open(coredump_path) as corefile:
+            with open(coredump_path, 'rb') as corefile:
                 result = corefile.read().decode('utf8', 'ignore')
             os.unlink(coredump_path)
         except IOError:
diff --git a/Tools/haiku/mimefix.sh b/Tools/haiku/mimefix.sh
index 88b0c6fcdc55..499a2552dca4 100644
--- a/Tools/haiku/mimefix.sh
+++ b/Tools/haiku/mimefix.sh
@@ -3,7 +3,7 @@
 # always make the best guess on the type of files, and the test suite relies on the types being
 # correct. So, let's fix them!
 
-set TESTS=BEOS:TYPE LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/*/*.html LayoutTests/css3/filters/regions-expanding.html LayoutTests/editing/caret/*.html
+TESTS="LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/*/*.html LayoutTests/css3/filters/regions-expanding.html LayoutTests/editing/caret/*.html"
 
-rmattr -f BEOS:TYPE $TESTS
-addattr BEOS:TYPE $TESTS
+rmattr BEOS:TYPE $TESTS
+addattr -t mime BEOS:TYPE text/html $TESTS