diff --git a/Gemfile b/Gemfile
index 053c27dc3..9c0465324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
 gem 'github-pages'
+
+require 'rbconfig'
+gem 'wdm', '~> 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
diff --git a/README.md b/README.md
index f6a6fbae4..1e4e8e0b6 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ Feel free to fork and make a pull request.
 
 You can view your changes locally by installing [jekyll](https://help.github.com/articles/using-jekyll-with-pages).
 
-In ubuntu 14.04:
+Installing Jekyll in Ubuntu 14.04
+---
 
     sudo apt-get install git ruby1.9.1 ruby1.9.1-dev nodejs
     sudo gem install bundle
@@ -18,7 +19,25 @@ In ubuntu 14.04:
     www-browser http://localhost:4000 &
     # work, work, work
 
-Alternately, when forking, you can create a new branch called `gh-pages`, then your
+Installing Jekyll in  Windows
+---
+
+- Follow the instructions in step 1 [here](http://jekyll-windows.juthilo.com/1-ruby-and-devkit/) (Installing Ruby and the Ruby DevKit).
+
+Then run:
+
+    gem install bundle
+    git clone https://github.com/<user>/ev3dev.github.io
+    cd ev3dev.github.io
+    bundle install
+    bundle exec jekyll serve --watch
+
+Now you should be able to visit your page at: [http://localhost:4000](http://localhost:4000). It should auto-update when you change the source files, so all you have to do is refresh your browser.
+
+Previewing Your Changes Online
+---
+
+When forking, you can create a new branch called `gh-pages`, then your
 changes can be viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this
 though, GitHub will send you lots of email like this, which you should ignore.