diff --git a/README.md b/README.md
index 65f63d2..31b89dd 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,9 @@
 
 ### Build ONOS from source
 
+ONOS is built with [Bazel](https://bazel.build/), an open-source build tool developed by Google.
+ONOS supports Bazel 0.17 You can download it from official website or package manager (e.g. apt, brew...)
+
 1. Clone the code from ONOS gerrit repository
 ```bash
 $ git clone https://gerrit.onosproject.org/onos
@@ -63,26 +66,21 @@
 $ . ~/.bash_profile
 ```
 
-3. Build ONOS with Buck
+3. Build ONOS with Bazel
 ```bash
 $ cd $ONOS_ROOT
-$ onos-buck build onos [--show-output]
+$ bazel build onos
 ```
 
-ONOS currently uses a modified version of Buck (`onos-buck`), which has been packaged with ONOS. Please use this version until our changes have been upstreamed and released as part of an official Buck release. 
-
-This will compile all source code assemble the installable onos.tar.gz, which is located in the buck-out directory. Note the --show-output option, which can be omitted, will display the path to this file.
-
-
 ### Start ONOS on local machine
 
 To run ONOS locally on the development machine, simply run the following command:
 
 ```bash
-$ onos-buck run onos-local [-- [clean] [debug]]
+$ bazel run onos-local [-- [clean] [debug]]
 ```
 
-or simplier one:
+or simpler one:
 
 ```bash
 $ ok [clean] [debug]
@@ -110,20 +108,20 @@
 To run ONOS unit tests, including code Checkstyle validation, run the following command:
 
 ```bash
-$ onos-buck test
+$ bazel query 'tests(//...)' | xargs bazel test
 ```
 
-Or more specific tests:
+Or better yet, to run code Checkstyle and all unit tests use the following convenience alias:
 
 ```bash
-$ onos-buck test [buck-test-rule]
+$ ot
 ```
 
 ## Contributing
 
 ONOS code is hosted and maintained using [Gerrit](https://gerrit.onosproject.org/).
 
-Code on GitHub is only a mirror. The ONOS project does **NOT** accept code through pull requests on GitHub. 
+Code on GitHub is only a mirror. The ONOS project does **NOT** accept code through pull requests on GitHub.
 
 To contribute to ONOS, please refer to [Sample Gerrit Workflow](https://wiki.onosproject.org/display/ONOS/Sample+Gerrit+Workflow). It should includes most of the things you'll need to get your contribution started!
 
@@ -138,4 +136,4 @@
 
 ## License
 
-ONOS (Open Network Operating System) is published under [Apache License 2.0](https://github.com/opennetworkinglab/onos/blob/master/LICENSE.txt)
\ No newline at end of file
+ONOS (Open Network Operating System) is published under [Apache License 2.0](https://github.com/opennetworkinglab/onos/blob/master/LICENSE.txt)