diff --git a/.travis.yml b/.travis.yml
index 6b38b090..3d6e2956 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,6 @@ env:
     DIRECTOR_TESTDB_USER="director_test"
 
 before_script:
+  - composer self-update --stable
   - ./test/travis-prepare.sh
   - composer install
diff --git a/composer.json b/composer.json
index 55034dd5..dceb9f0c 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,15 @@
       "type": "package",
       "package": {
         "name": "icinga/icingaweb2",
-        "version": "2.3.4",
+        "version": "2.4.0",
         "dist": {
-          "url": "https://github.com/Icinga/icingaweb2/archive/v2.3.4.zip",
+          "url": "https://github.com/Icinga/icingaweb2/archive/v2.4.0.zip",
           "type": "zip"
+        },
+        "source": {
+          "url": "https://github.com/Icinga/icingaweb2.git",
+          "type": "git",
+          "reference": "master"
         }
       }
     }