diff --git a/.vimrc b/.vimrc
index be6a1fb..325e320 100644
--- a/.vimrc
+++ b/.vimrc
@@ -54,7 +54,12 @@ filetype indent on
 set ruler
 
 "Clipboard stuff
-set clipboard=unnamedplus
+"set clipboard=unnamedplus
+if system('uname -s') == "Darwin\n"
+  set clipboard=unnamed "OSX
+else
+  set clipboard=unnamedplus "Linux
+endif
 
 " Height of the command bar
 set cmdheight=2