diff --git a/ChangeLog.markdown b/ChangeLog.markdown
index 1eef5aed4b6..58d6335d7e0 100644
--- a/ChangeLog.markdown
+++ b/ChangeLog.markdown
@@ -3,6 +3,13 @@ PHPUnit 3.6
 
 This is the list of changes for the PHPUnit 3.6 release series.
 
+PHPUnit 3.6.5
+-------------
+
+* Fixed #204: Bootstrap script should be loaded before trying to load `testSuiteLoaderClass`.
+* Fixed #413: PHPT test failures display double diffs.
+* Fixed #430: OutputTestCase didn't work with @depends. Please note that this way of output testing is still deprecated.
+
 PHPUnit 3.6.4
 -------------
 
diff --git a/PHPUnit/Extensions/OutputTestCase.php b/PHPUnit/Extensions/OutputTestCase.php
index f90cf91da92..214a102c283 100644
--- a/PHPUnit/Extensions/OutputTestCase.php
+++ b/PHPUnit/Extensions/OutputTestCase.php
@@ -71,6 +71,6 @@ protected function runTest()
           'PHPUnit_Extensions_OutputTestCase.'
         );
 
-        parent::runTest();
+        return parent::runTest();
     }
 }
diff --git a/PHPUnit/Framework/TestFailure.php b/PHPUnit/Framework/TestFailure.php
index 7e6ea639f05..810a8af2ca2 100644
--- a/PHPUnit/Framework/TestFailure.php
+++ b/PHPUnit/Framework/TestFailure.php
@@ -117,16 +117,12 @@ public static function exceptionToString(Exception $e)
         if ($e instanceof PHPUnit_Framework_SelfDescribing) {
             $buffer = $e->toString();
 
-            if ($e instanceof PHPUnit_Framework_ComparisonFailure) {
-                $buffer = trim($buffer . "\n" . $e->getDiff());
-            }
-
             if ($e instanceof PHPUnit_Framework_ExpectationFailedException && $e->getComparisonFailure()) {
-                $buffer = trim($buffer . "\n" . $e->getComparisonFailure()->getDiff());
+                $buffer = $buffer . "\n" . $e->getComparisonFailure()->getDiff();
             }
 
             if (!empty($buffer)) {
-                $buffer .= "\n";
+                $buffer = trim($buffer) . "\n";
             }
         }
 
diff --git a/PHPUnit/TextUI/Command.php b/PHPUnit/TextUI/Command.php
index 34290eb32d6..11243d41b1a 100644
--- a/PHPUnit/TextUI/Command.php
+++ b/PHPUnit/TextUI/Command.php
@@ -609,6 +609,12 @@ protected function handleArguments(array $argv)
 
             $phpunit = $configuration->getPHPUnitConfiguration();
 
+            $configuration->handlePHPConfiguration();
+
+            if (!isset($this->arguments['bootstrap']) && isset($phpunit['bootstrap'])) {
+              $this->handleBootstrap($phpunit['bootstrap']);
+            }
+
             if (isset($phpunit['printerClass'])) {
                 if (isset($phpunit['printerFile'])) {
                     $file = $phpunit['printerFile'];
@@ -649,16 +655,6 @@ protected function handleArguments(array $argv)
                 }
             }
 
-            $configuration->handlePHPConfiguration();
-
-            if (!isset($this->arguments['bootstrap'])) {
-                $phpunitConfiguration = $configuration->getPHPUnitConfiguration();
-
-                if (isset($phpunitConfiguration['bootstrap'])) {
-                    $this->handleBootstrap($phpunitConfiguration['bootstrap']);
-                }
-            }
-
             $browsers = $configuration->getSeleniumBrowserConfiguration();
 
             if (!empty($browsers) &&
diff --git a/PHPUnit/Util/Log/TAP.php b/PHPUnit/Util/Log/TAP.php
index 118d500d404..bec9ca1c7df 100644
--- a/PHPUnit/Util/Log/TAP.php
+++ b/PHPUnit/Util/Log/TAP.php
@@ -43,7 +43,9 @@
  * @since      File available since Release 3.0.0
  */
 
-require_once 'SymfonyComponents/YAML/sfYamlDumper.php';
+if (!class_exists('sfYamlDumper', FALSE)) {
+    require_once 'SymfonyComponents/YAML/sfYamlDumper.php';
+}
 
 /**
  * A TestListener that generates a logfile of the
diff --git a/package.xml b/package.xml
index 20c52e88181..247712b8adb 100644
--- a/package.xml
+++ b/package.xml
@@ -468,6 +468,7 @@
    <file baseinstalldir="/" name="phpunit.php" role="script">
     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config"/>
     <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
+    <tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
     <tasks:replace from="@package_version@" to="version" type="package-info" />
    </file>
    <file baseinstalldir="/" name="phpunit.bat" role="script">