diff --git a/.gitignore b/.gitignore
index 7dac201e32..87acbb84a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@ nbproject
 .project
 .settings
 composer.lock
-vendor/bin
+vendor/
+!vendor/README.md
+!vendor/ZF2/
diff --git a/composer.json b/composer.json
index bd5ccfb269..7a20f6edda 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
     "homepage": "http://framework.zend.com/",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "2.2.7"
+        "zendframework/zendframework": "~2.4.11"
     }
 }
diff --git a/composer.phar b/composer.phar
index 8b5328daed..89920d3980 100755
Binary files a/composer.phar and b/composer.phar differ
diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644
index 4578c85a24..0000000000
--- a/vendor/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-!.gitignore
-.composer
-composer
-zendframework
-autoload.php