diff --git a/docs/fuse.md b/docs/fuse.md
index 07efe503d..60d79be52 100644
--- a/docs/fuse.md
+++ b/docs/fuse.md
@@ -14,6 +14,8 @@ sudo chown <username> /ipfs
 sudo chown <username> /ipns
 ```
 
+Depending on whether you are using OSX or Linux, follow the proceeding instructions.
+
 ## Mac OSX -- OSXFUSE
 
 It has been discovered that versions of `osxfuse` prior to `2.7.0` will cause a kernel panic. For everyone's sake, please upgrade (latest at time of writing is `2.7.4`). The installer can be found at https://osxfuse.github.io/. There is also a homebrew formula (`brew install osxfuse`) but users report best results installing from the official OSXFUSE installer package.
@@ -40,7 +42,32 @@ Then change permissions on the fuse config:
 sudo chown <username>:<groupname> /etc/fuse.conf
 ```
 
-(note `<groupname>` should probably be `fuse`)
+You may also have to change `/dev/fuse`:
+
+```sh
+sudo chown <username>:<groupname> /dev/fuse
+```
+
+Note: `<groupname>` will usually be `fuse`. Typically, you add the authorized users to the `fuse` group:
+
+```sh
+usermod -a -G fuse <username>
+```
+
+## Mounting IPFS
+
+Once FUSE and the mountpoints have been created, issue the following command:
+
+```sh
+ipfs daemon --mount
+```
+
+If you wish to allow other users to use the mount points, use the following:
+
+```sh
+ipfs config Mounts.AllowOther --bool true
+ipfs daemon --mount
+```
 
 ## Troubleshooting
 
diff --git a/docs/windows.md b/docs/windows.md
new file mode 100644
index 000000000..7cea47338
--- /dev/null
+++ b/docs/windows.md
@@ -0,0 +1,13 @@
+# Building on Windows
+
+## Build
+
+Fuse is not supported for Windows, so you need to build IPFS without Fuse:
+
+```sh
+go build -tags nofuse ./cmd/ipfs
+```
+
+## TODO
+
+Add more instructions on setting up the golang environment on Windows