diff --git a/markdown.vim b/markdown.vim
new file mode 100644
index 0000000..8c97d43
--- /dev/null
+++ b/markdown.vim
@@ -0,0 +1,4 @@
+set ts=2
+set sw=2
+set expandtab
+set nolinebreak
diff --git a/vimrc b/vimrc
index bd7c56b..7e79729 100644
--- a/vimrc
+++ b/vimrc
@@ -7,6 +7,7 @@ exec "cd " . vimrc_git
 source vundle.vim
 source java.vim
 source javascript.vim
+source markdown.vim
 exec "cd " . oldwd
 
 " turn on file type plugins