diff --git a/README.md b/README.md
index 8e6298fd3..0985423d0 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Rclone is a command line program to sync files and directories to and from
* Microsoft One Drive
* Hubic
* Backblaze B2
+ * Yandex Disk
* The local filesystem
Features
diff --git a/docs/content/about.md b/docs/content/about.md
index 89b8cc0aa..641276252 100644
--- a/docs/content/about.md
+++ b/docs/content/about.md
@@ -22,6 +22,7 @@ Rclone is a command line program to sync files and directories to and from
* Microsoft One Drive
* Hubic
* Backblaze B2
+ * Yandex Disk
* The local filesystem
Features
diff --git a/docs/content/overview.md b/docs/content/overview.md
index 910904d78..882db1295 100644
--- a/docs/content/overview.md
+++ b/docs/content/overview.md
@@ -26,6 +26,7 @@ Here is an overview of the major features of each cloud storage system.
| Microsoft One Drive | No | Yes | Yes | No |
| Hubic | Yes | Yes | No | No |
| Backblaze B2 | No | Partial | No | No |
+| Yandex Disk | Yes | Yes | No | No |
| The local filesystem | Yes | Yes | Depends | No |
### MD5SUM ###
diff --git a/docs/content/yandex.md b/docs/content/yandex.md
new file mode 100644
index 000000000..a5052780b
--- /dev/null
+++ b/docs/content/yandex.md
@@ -0,0 +1,87 @@
+---
+title: "Yandex"
+description: "Yandex Disk"
+date: "2015-12-30"
+---
+
+Yandex Disk
+----------------------------------------
+
+[Yandex Disk](https://disk.yandex.com) is a cloud storage solution created by [Yandex](http://yandex.com).
+
+Yandex paths may be as deep as required, eg `remote:directory/subdirectory`.
+
+Here is an example of making a yandex configuration. First run
+
+ rclone config
+
+This will guide you through an interactive setup process:
+
+```
+No remotes found - make a new one
+n) New remote
+q) Quit config
+n/q> n
+name> remote
+What type of source is it?
+Choose a number from below
+ 1) amazon cloud drive
+ 2) b2
+ 3) drive
+ 4) dropbox
+ 5) google cloud storage
+ 6) swift
+ 7) hubic
+ 8) local
+ 9) onedrive
+10) s3
+11) yandex
+type> 11
+Yandex Client Id - leave blank normally.
+client_id>
+Yandex Client Secret - leave blank normally.
+client_secret>
+Remote config
+If your browser doesn't open automatically go to the following link: http://127.0.0.1:53682/auth
+Log in and authorize rclone for access
+Waiting for code...
+Got code
+--------------------
+[remote]
+client_id =
+client_secret =
+token = {"access_token":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","token_type":"bearer","expiry":"2016-12-29T12:27:11.362788025Z"}
+--------------------
+y) Yes this is OK
+e) Edit this remote
+d) Delete this remote
+y/e/d> y
+```
+
+This remote is called `remote` and can now be used like this
+
+See top level directories
+
+ rclone lsd remote:
+
+Make a new directory
+
+ rclone mkdir remote:directory
+
+List the contents of a directory
+
+ rclone ls remote:directory
+
+Sync `/home/local/directory` to the remote path, deleting any
+excess files in the path.
+
+ rclone sync /home/local/directory remote:directory
+
+### Modified time ###
+
+Modified times are supported and are stored accurate to 1 ns in custom
+metadata called `rclone_modified` in RFC3339 with nanoseconds format.
+
+### MD5 checksums ###
+
+MD5 checksums are natively supported by Yandex Disk.
diff --git a/docs/layouts/chrome/navbar.html b/docs/layouts/chrome/navbar.html
index acf5de203..d08416640 100644
--- a/docs/layouts/chrome/navbar.html
+++ b/docs/layouts/chrome/navbar.html
@@ -41,6 +41,7 @@
Hubic
Backblaze B2
Local
+ Yandex Disk
Contact
diff --git a/make_manual.py b/make_manual.py
index 86f99e7bf..ecb651555 100755
--- a/make_manual.py
+++ b/make_manual.py
@@ -27,6 +27,7 @@ docs = [
"onedrive.md",
"hubic.md",
"b2.md",
+ "yandex.md",
"local.md",
"changelog.md",
"bugs.md",