diff --git a/README.md b/README.md
index be31d7473..cd1f7a622 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Ethereum Beacon Chain
 [![Build Status (Travis)](https://img.shields.io/travis/status-im/nim-beacon-chain/master.svg?label=Linux%20/%20macOS "Linux/macOS build status (Travis)")](https://travis-ci.org/status-im/nim-beacon-chain)
-[![Windows build status (Appveyor)](https://img.shields.io/appveyor/ci/jarradh/nim-beacon-chain/master.svg?label=Windows "Windows build status (Appveyor)")](https://travis-ci.org/jarradh/nim-beacon-chain)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Windows build status (Appveyor)](https://img.shields.io/appveyor/ci/nimbus/nim-beacon-chain/master.svg?label=Windows "Windows build status (Appveyor)")](https://ci.appveyor.com/project/nimbus/nim-beacon-chain)
+[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 ![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)
 
 An alternative implementation of the Ethereum beacon chain in Nim.
@@ -34,7 +35,9 @@ nimble install https://github.com/status-im/nim-beacon-chain@#master
 ## License
 
 Licensed and distributed under either of
-  * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
-  * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
+
+* MIT license: [LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+
 at your option. This file may not be copied, modified, or distributed except according to those terms.