diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..32411353
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,6 @@
+# ignore documentation-specific files
+
+.jekyll-metadata
+Gemfile
+Gemfile.lock
+_site/
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..79b3b4e9
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,4 @@
+# Documentation Readme
+
+This project's documentation is hosted using GitHub pages, which serves static pages using Jeykll.
+[Please refer to the official documentation for instructions for how to build the site locally.](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/)
\ No newline at end of file
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..ec321c11
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,11 @@
+title: Solaar
+description: Linux Device manager for the Logitech Unifying Receiver.
+tagline: Linux Device manager for the Logitech Unifying Receiver.
+owner: pwr
+owner_url: https://github.com/pwr
+repository: pwr/Solaar
+version: 0.9.2
+ga_id: UA-36908718-1
+show_downloads: false
+encoding: utf-8
+theme: jekyll-theme-slate
\ No newline at end of file
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
new file mode 100644
index 00000000..694090c1
--- /dev/null
+++ b/docs/_layouts/default.html
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+{% seo %}
+
+
+
+
+
+
+
+ {% if site.github.is_project_page %}
+ View on GitHub
+ {% endif %}
+
+
+
+
+
+ {% if site.google_analytics %}
+
+ {% endif %}
+
+
diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
new file mode 100644
index 00000000..1f290489
Binary files /dev/null and b/docs/assets/favicon.png differ
diff --git a/docs/assets/solaar.svg b/docs/assets/solaar.svg
new file mode 100644
index 00000000..4a302b9e
--- /dev/null
+++ b/docs/assets/solaar.svg
@@ -0,0 +1,100 @@
+
+
diff --git a/docs/debian.md b/docs/debian.md
index 9fd9a6c0..8313209f 100644
--- a/docs/debian.md
+++ b/docs/debian.md
@@ -1,3 +1,8 @@
+---
+title: Debian Repository
+layout: page
+---
+
# Debian repository
Solaar is now part of the [official debian repository](https://packages.debian.org/solaar-gnome3), to install it on your debian machine, use the following command: `sudo apt install solaar-gnome3`
diff --git a/docs/devices.md b/docs/devices.md
index 113e03f5..255f9dfa 100644
--- a/docs/devices.md
+++ b/docs/devices.md
@@ -1,3 +1,8 @@
+---
+title: Supported Devices
+layout: page
+---
+
# Supported devices
**Solaar** will detect all devices paired with your receiver, and at the very
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..6365d2d9
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,99 @@
+---
+title: Solaar
+layout: default
+---
+
+**Solaar** is a Linux device manager for Logitech's [Unifying][unifying] Receiver
+peripherals. It is able to pair/unpair devices to the receiver, and for most
+devices read battery status.
+
+It comes in two flavors, command-line and GUI. Both are able to list the
+devices paired to a Unifying Receiver, show detailed info for each device, and
+also pair/unpair supported devices with the receiver.
+
+[unifying]: http://logitech.com/promotions/6072
+
+## Supported Devices
+
+**Solaar** will detect all devices paired with your Unifying Receiver, and at
+the very least display some basic information about them.
+
+For some devices, extra settings (usually not available through the standard
+Linux system configuration) are supported. For a full list of supported devices
+and their features, see [docs/devices.md]({{ site.baseurl }}/devices).
+
+
+## Pre-built packages
+
+Pre-built packages are available for a few Linux distros.
+
+* Debian 7 (Wheezy) or higher: packages in this [repository]({{ site.baseurl }}/debian)
+* Ubuntu/Kubuntu 16.04+: use the `solaar-gnome3` and/or `solaar` package from [universe repository][universe repository]
+* Ubuntu/Kubuntu 12.04 to 14.04: use `solaar` package from [ppa:daniel.pavel/solaar][ppa]
+
+The `solaar` package uses a standard system tray implementation; to ensure
+integration with *gnome-shell* or *Unity*, install `solaar-gnome3`.
+
+* an [Arch package][arch], courtesy of Arnaud Taffanel
+* a [Fedora package][fedora], courtesy of Eric Smith
+* a [Gentoo package][gentoo], courtesy of Carlos Silva and Tim Harder
+* a [Mageia package][mageia], courtesy of David Geiger
+* an [OpenSUSE rpm][opensuse], courtesy of Mathias Homann
+
+[ppa]: http://launchpad.net/~daniel.pavel/+archive/solaar
+[arch]: http://aur.archlinux.org/packages/solaar
+[fedora]: https://apps.fedoraproject.org/packages/solaar
+[gentoo]: https://packages.gentoo.org/packages/app-misc/solaar
+[mageia]: http://mageia.madb.org/package/show/release/cauldron/application/0/name/solaar
+[opensuse]: http://software.opensuse.org/package/Solaar
+[universe repository]: http://packages.ubuntu.com/search?keywords=solaar&searchon=names&suite=all§ion=all
+
+
+## Manual installation
+
+See [docs/installation.md]({{ site.baseurl }}/installation) for the step-by-step
+procedure for manual installation.
+
+
+## Known Issues
+
+- KDE/Kubuntu: if some icons appear broken in the application, make sure you've
+ properly configured the Gtk theme and icon theme in KDE's control panel.
+
+- Some devices using the [Nano Receiver][nano] (which is very similar to the
+ Unifying Receiver) are supported, but not all. For details, see
+ [docs/devices.md]({{ site.baseurl }}/devices).
+
+- Running the command-line application (`bin/solaar-cli`) while the GUI
+ application is also running *may* occasionally cause either of them to become
+ confused about the state of the devices. I haven't encountered this often
+ enough to be able to be able to diagnose it properly yet.
+
+[nano]: http://support.logitech.com/en_us/parts
+
+
+## License
+
+This software is distributed under the terms of the
+[GNU Public License, v2](COPYING).
+
+
+## Thanks
+
+This project began as a third-hand clone of [Noah K. Tilton](https://github.com/noah)'s
+logitech-solar-k750 project on GitHub (no longer available). It was developed
+further thanks to the diggings in Logitech's HID++ protocol done by many other
+people:
+
+- [Julien Danjou](http://julien.danjou.info/blog/2012/logitech-k750-linux-support),
+who also provided some internal
+[Logitech documentation](http://julien.danjou.info/blog/2012/logitech-unifying-upower)
+- [Lars-Dominik Braun](http://6xq.net/git/lars/lshidpp.git)
+- [Alexander Hofbauer](http://derhofbauer.at/blog/blog/2012/08/28/logitech-performance-mx)
+- [Clach04](http://bitbucket.org/clach04/logitech-unifying-receiver-tools)
+- [Peter Wu](https://lekensteyn.nl/logitech-unifying.html)
+- [Nestor Lopez Casado](http://drive.google.com/folderview?id=0BxbRzx7vEV7eWmgwazJ3NUFfQ28)
+provided some more Logitech specifications for the HID++ protocol
+
+Also thanks to Douglas Wagner, Julien Gascard and Peter Wu for helping with
+application testing and supporting new devices.
diff --git a/docs/installation.md b/docs/installation.md
index eae9ae9d..b3c0b40a 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -1,3 +1,8 @@
+---
+title: Manual Installation
+layout: page
+---
+
# Manual installation
### Requirements
diff --git a/jekyll/_config.yml b/jekyll/_config.yml
deleted file mode 100644
index 7c05c378..00000000
--- a/jekyll/_config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-title: Solaar
-tagline: Linux devices manager for the Logitech Unifying Receiver.
-owner: pwr
-owner_url: https://github.com/pwr
-repository: https://github.com/pwr/Solaar
-version: 0.9.2
-tar_download: https://github.com/pwr/Solaar/archive/0.9.2.tar.gz
-ga_id: UA-36908718-1
-
-pygments: true
-safe: true
-lsi: false
diff --git a/jekyll/_includes/solaar.svg b/jekyll/_includes/solaar.svg
deleted file mode 100644
index 1681b79c..00000000
--- a/jekyll/_includes/solaar.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/jekyll/_layouts/default.html b/jekyll/_layouts/default.html
deleted file mode 100644
index aa96978c..00000000
--- a/jekyll/_layouts/default.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
/ {N;beop;}
- :end
- SED
-done
-
-# set timestmap of the created files to match the sources
-fix_times README.md index.html
-fix_times docs/devices.md devices.html
-fix_times docs/installation.md installation.html
-fix_times docs/debian.md debian.html
-fix_times jekyll/images images
-fix_times share/solaar/icons/solaar.svg images/favicon.png
-fix_times jekyll/style style