diff --git a/README.md b/README.md
index 3ed144a..a33c8e3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 #Virtual Smart Card Architecture
 
-[![Build Status Image](https://travis-ci.org/frankmorgner/vsmartcard.png?branch=master)](https://travis-ci.org/frankmorgner/vsmartcard) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3987/badge.svg)](https://scan.coverity.com/projects/3987)
-
 Virtual Smart Card Architecture is an umbrella project for various
 projects concerned with the emulation of different types of smart card readers
 or smart cards themselves.
@@ -15,3 +13,5 @@ Currently the following projects are part of Virtual Smart Card Architecture:
 - [nPA Smart Card Library](http://frankmorgner.github.io/vsmartcard/npa/README.html)
 
 Please refer to [our project's website](http://frankmorgner.github.io/vsmartcard) for more information.
+
+[![Travis CI Build Status Image](https://img.shields.io/travis/frankmorgner/vsmartcard/master.svg?label=Travis%20CI%20build)](https://travis-ci.org/frankmorgner/vsmartcard) [![AppVeyor CI Build Status Image](https://img.shields.io/appveyor/ci/frankmorgner/vsmartcard/master.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/frankmorgner/vsmartcard) [![Coverity Scan Status](https://img.shields.io/coverity/scan/3987.svg?label=Coverity%20scan)](https://scan.coverity.com/projects/3987)
diff --git a/doc/index.txt b/doc/index.txt
index 39e7bf1..06e3da5 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -6,14 +6,6 @@
 Welcome to the |vsmartcard| documentation!
 ################################################################################
 
-.. image:: https://travis-ci.org/frankmorgner/vsmartcard.png?branch=master
-    :target: https://travis-ci.org/frankmorgner/vsmartcard
-    :alt: Build Status Image
-
-.. image:: https://scan.coverity.com/projects/3987/badge.svg
-    :target: https://scan.coverity.com/projects/3987
-    :alt: Coverity Scan Build Status
-
 Welcome to the |vsmartcard|. |vsmartcard| is an umbrella project for various
 projects concerned with the emulation of different types of smart card readers
 or smart cards themselves.
@@ -70,6 +62,18 @@ have a look at these programming guides and try yourself:
    virtualsmartcard/api
    npa/api
 
+.. image:: https://img.shields.io/travis/frankmorgner/vsmartcard/master.svg?label=Travis%20CI%20build
+    :target: https://travis-ci.org/frankmorgner/vsmartcard
+    :alt: Travis CI Build Status Image
+
+.. image:: https://img.shields.io/appveyor/ci/frankmorgner/vsmartcard/master.svg?label=AppVeyor%20build
+    :target: https://ci.appveyor.com/project/frankmorgner/vsmartcard
+    :alt: AppVeyor CI Build Status Image
+
+.. image:: https://img.shields.io/coverity/scan/3987.svg?label=Coverity%20scan
+    :target: https://scan.coverity.com/projects/3987
+    :alt: Coverity Scan Status
+
 
 Download
 --------