diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
new file mode 100644
index 0000000..e341062
--- /dev/null
+++ b/after/ftplugin/markdown.vim
@@ -0,0 +1 @@
+setlocal formatoptions=
diff --git a/vimrc b/vimrc
index ebe0f8a..4b196a7 100644
--- a/vimrc
+++ b/vimrc
@@ -82,6 +82,7 @@ set modelines=0
 set nobackup
 set nojoinspaces
 set nomodeline
+set nowrap
 set nowritebackup
 set nrformats-=octal
 set number
@@ -100,7 +101,6 @@ set ttimeout
 set ttimeoutlen=100
 set ttyfast
 set updatetime=300
-set wrap
 
 "===============================================================================
 " General settings for non-minimal Vim builds.