diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..39d86671
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto eol=lf
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
diff --git a/.cvsignore b/.gitignore
similarity index 62%
rename from .cvsignore
rename to .gitignore
index 059edf8b..868950d0 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.deps/
+.libs/
+m4/
 *.diff
 *.patch
 y.output
@@ -5,9 +8,7 @@ y.tab.h
 lexer.c
 config_gram.c
 config_gram.h
-.cvsignore
 .depend
-.deps
 INSTALL
 Makefile.in
 Makefile
@@ -31,3 +32,26 @@ config.log
 config.status
 config.sub
 avrdude
+libtool
+ltmain.sh
+ylwrap
+
+*.o
+*.lo
+*.a
+*.la
+
+# Visual Studio
+.vs/
+[Dd]ebug/
+[Rr]elease/
+x64/
+x86/
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.log
+
+# Visual Studio code
+.vscode/
diff --git a/doc/.cvsignore b/doc/.gitignore
similarity index 91%
rename from doc/.cvsignore
rename to doc/.gitignore
index afe95fe9..c0147403 100644
--- a/doc/.cvsignore
+++ b/doc/.gitignore
@@ -1,4 +1,5 @@
-.cvsignore
+avrdude.t2d/
+avrdude.t2p/
 Makefile
 Makefile.in
 avrdude-html
diff --git a/windows/.cvsignore b/windows/.gitignore
similarity index 71%
rename from windows/.cvsignore
rename to windows/.gitignore
index 601c4fbf..e9955884 100644
--- a/windows/.cvsignore
+++ b/windows/.gitignore
@@ -1,4 +1,3 @@
-.cvsignore
 .deps
 Makefile
 Makefile.in