diff --git a/Makefile b/Makefile
index 6ada863..38487b1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,29 @@ FILES2 = msmtprc
 
 all: $(FILES)
 
+ifeq ($(OS),Windows_NT)
+
+install:
+	mkdir -p $(HOME)\vimfiles\autoload
+	cp gitconfig $(HOME)\.gitconfig
+	cp vimrc $(HOME)\_vimrc
+	cp gvimrc $(HOME)\_gvimrc
+	cp vim-pathogen/autoload/pathogen.vim $(HOME)\vimfiles\autoload
+
+else
+
 install: $(FILES)
 	mkdir -p ~/.ssh ~/.vim/autoload
 	for i in $(FILES); do install -m0644 $$i ~/.$$i; done
 	for i in $(FILES2); do install -m0600 $$i ~/.$$i; done
 	install -m0644 vim-pathogen/autoload/pathogen.vim ~/.vim/autoload/
 
-clean:
-
 check: $(FILES)
 	for i in $(FILES); do diff -u ~/.$$i $$i; done
 
+endif
+
+clean:
+
 %: %.m4
 	m4 $< >$@
diff --git a/gvimrc b/gvimrc
index 2bd11fe..141a5b3 100644
--- a/gvimrc
+++ b/gvimrc
@@ -1,2 +1,8 @@
-set bg=light
+colors jellybeans
 set guicursor+=a:blinkon0
+
+if has('win32') || has('win64')
+  set guifont=Consolas:h11
+else
+  set guifont=Monospace\ 8
+endif
diff --git a/vimrc b/vimrc
index ae8e74d..d0a23d8 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,4 @@
-set tw=0 ts=8 sts=2 sw=2 sm ai si
-"set gfn=Monospace\ 8		" use Monospace at 8pt
+set tw=0 expandtab ts=8 sts=2 sw=2 sm ai si
 set ml mls=5				" scan 5 lines for modelines
 syn on						" enable syntax highlighting
 set hls						" highlight search
@@ -15,6 +14,9 @@ au BufNewFile,BufRead *.i set ft=swig
 au BufNewFile,BufRead *.factor set ft=factor
 au BufNewFile,BufRead Gemfile set ft=ruby
 au BufReadCmd *.epub call zip#Browse(expand("<amatch>"))
-au BufNewFile,BufRead *.cabal,*.hamlet,*.hs set expandtab
 
 execute pathogen#infect()
+
+set vb                          " turn on the "visual bell" - which is much quieter than the "audio blink"
+set nobackup
+se bs=2