diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 57831dc..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-target
-maven.log
-*.log
-*.merlin
-*.ser
-.classpath
-.project
-junit*.properties
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4dd87bc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+target
+*.log
+.classpath
+.project
+*.iml