diff --git a/README.md b/README.md
index 3162760845e..b1a8217a983 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ multirust run nightly cargo install --git https://github.com/rust-lang-nursery/r
 
 * [Vim](http://johannh.me/blog/rustfmt-vim.html)
 * [Emacs](https://github.com/fbergroth/emacs-rustfmt)
+* [Atom](atom.md).
 
 
 ## How to build and test
diff --git a/atom.md b/atom.md
new file mode 100644
index 00000000000..a74a5323301
--- /dev/null
+++ b/atom.md
@@ -0,0 +1,16 @@
+# Running Rustfmt from Atom
+
+You'll need to install [Beautify](https://atom.io/packages/atom-beautify), you
+can do this by running `apm install atom-beautify`.
+
+There are 2 setting that need to be configured in the atom beautifier config. 
+
+Install rustfmt as per the [readme](README.md). In atom beautifier, make sure
+rustfmt is the formatter:
+
+![image](https://cloud.githubusercontent.com/assets/6623285/11109392/e4bd9542-8915-11e5-805b-a02664b1f502.png)
+
+Also set the path to your rustfmt location in atom beautifier as shown below.
+(This setting is towards the bottom of the screen. Need to scroll):
+
+![image](https://cloud.githubusercontent.com/assets/6623285/11109320/54a0117e-8915-11e5-94be-80b5e91072eb.png)