diff --git a/CHANGELOG.md b/CHANGELOG.md
index 245b4ca52..b960841ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Rocketeer follows the [Semantic Versioning 2.0](http://semver.org/spec/v2.0.0.html) spec.
 
+## [2.2.1] - Unreleased
+
+### Fixed
+- Rocketeer now uses the `composer.json` as source of truth for which extensions to check against
+- Fixed characters encoding in repository credentials
+
 ## [2.2.0] - 2015-04-04
 
 ### Added
diff --git a/src/Rocketeer/Services/Connections/ConnectionsHandler.php b/src/Rocketeer/Services/Connections/ConnectionsHandler.php
index 72757bf8b..0371d802b 100644
--- a/src/Rocketeer/Services/Connections/ConnectionsHandler.php
+++ b/src/Rocketeer/Services/Connections/ConnectionsHandler.php
@@ -406,6 +406,8 @@ public function getRepositoryEndpoint()
 
         // Add credentials if possible
         if ($username || $password) {
+            $username = urlencode($username);
+            $password = urlencode($password);
 
             // Build credentials chain
             $credentials = $password ? $username.':'.$password : $username;