diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..74122b0
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,6 @@
+imports:
+    - php
+
+tools:
+    external_code_coverage:
+        timeout: 600 # Timeout in seconds.
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 2be8d3c..1a457a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ services:
 install:
   - composer self-update && composer --version
 # core framework:
-#  - composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist
   - composer install --prefer-dist
   - tests/unit/data/travis/mongodb-setup.sh
   - tests/unit/data/travis/apc-setup.sh
@@ -35,9 +34,9 @@ before_script:
   - mongo yii2test --eval 'db.addUser("travis", "test");'
 
 script:
-#  - vendor/bin/phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
-  - vendor/bin/phpunit --verbose --exclude-group mssql,oci,wincache,xcache,zenddata
+  - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --exclude-group mssql,oci,wincache,xcache,zenddata
   - cd apps/basic && php vendor/bin/codecept run
 
-#after_script:
-#  - php vendor/bin/coveralls
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/README.md b/README.md
index 1c07021..cd22a26 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ which is the latest stable release of Yii.
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2/v/stable.png)](https://packagist.org/packages/yiisoft/yii2)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2/downloads.png)](https://packagist.org/packages/yiisoft/yii2)
 [![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2)
+[![Code Coverage](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/coverage.png?s=31d80f1036099e9d6a3e4d7738f6b000b3c3d10e)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
 [![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/quality-score.png?s=b1074a1ff6d0b214d54fa5ab7abbb90fc092471d)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
 
@@ -49,8 +50,9 @@ DOCUMENTATION
 
 A draft of the [Definitive Guide](docs/guide/index.md) is available.
 
-API docs and a (quite bad) rendering of the definitive guide are currently
+API docs and a rendering of the definitive guide are currently
 available at http://stuff.cebe.cc/yii2docs/ (updated four times per hour).
+We will make guide and API docs available on yiiframework.com with the beta release.
 
 For 1.1 users, you may refer to [Upgrading from Yii 1.1](docs/guide/upgrade-from-v1.md)
 to have a general idea of what has changed in 2.0.
diff --git a/framework/README.md b/framework/README.md
index 22af4a4..228f5fb 100644
--- a/framework/README.md
+++ b/framework/README.md
@@ -1,7 +1,7 @@
 Yii PHP Framework Version 2
 ===========================
 
-This is the core framework code of [Yii 2](https://github.com/yiisoft/yii2).
+This is the core framework code of [Yii 2](https://github.com/yiisoft/yii2#readme).
 
 
 Installation