diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1585c2..ec240e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,14 @@ CHANGELOG
 
 ---
 
+* 0.3.3 (2015-05-26)
+
+* BF: Framing bug on large messages upon TCP fragmentation
+* BF: Symfony Router query parameter defaults applied to Request
+* BF: WAMP CURIE on all URIs
+* OriginCheck rules applied to FlashPolicy
+* Switched from PSR-0 to PSR-4
+
 * 0.3.2 (2014-06-08)
 
  * BF: No messages after closing handshake (fixed rare race condition causing 100% CPU)
diff --git a/composer.json b/composer.json
index 6096381..c4a7809 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
       , "irc":    "irc://irc.freenode.org/reactphp"
     }
   , "autoload": {
-        "psr-0": {
-            "Ratchet": "src"
+        "psr-4": {
+            "Ratchet\\": "src/Ratchet"
         }
     }
   , "require": {
diff --git a/src/Ratchet/ConnectionInterface.php b/src/Ratchet/ConnectionInterface.php
index 594e339..c8c4e1c 100644
--- a/src/Ratchet/ConnectionInterface.php
+++ b/src/Ratchet/ConnectionInterface.php
@@ -5,7 +5,7 @@ namespace Ratchet;
  * The version of Ratchet being used
  * @var string
  */
-const VERSION = 'Ratchet/0.3.2';
+const VERSION = 'Ratchet/0.3.3';
 
 /**
  * A proxy object representing a connection to the application
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9d21c77..40791ba 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,4 @@
 <?php
 
     $loader = require __DIR__ . '/../vendor/autoload.php';
-    $loader->add('Ratchet', __DIR__ . '/helpers');
-    $loader->register();
+    $loader->addPsr4('Ratchet\\', __DIR__ . '/helpers/Ratchet');