diff --git a/README.md b/README.md
index f1458308ed..584157fd4c 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ reading. It is cross platform, running on Linux, Windows and OS X.
 For more information, see the [calibre About page](https://calibre-ebook.com/about)
 
 [![Build Status](https://api.travis-ci.org/kovidgoyal/calibre.svg)](https://travis-ci.org/kovidgoyal/calibre)
+[![Build status](https://ci.appveyor.com/api/projects/status/v3nkfq0t3pse8lep?svg=true&passingText=windows%20OK&failingText=windows%20KO)](https://ci.appveyor.com/project/kovidgoyal/calibre)
 
 Screenshots
 -------------
diff --git a/appveyor.yml b/appveyor.yml
index a282516a36..449f5ae986 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,9 +9,12 @@ branches:
 
 cache:
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     - node_modules
 >>>>>>> Start work on setting up CO testing on windows with AppVeyor
+=======
+>>>>>>> Add AppVeyor badge
     - .build-cache
 
 environment: