diff --git a/.gitignore b/.gitignore
index afb4e67a1b8..0716fb1ac09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ configure-stamp
 *.bin
 *.mrk
 *.mrk2
+*.mrk3
 
 .dupload.conf
 
diff --git a/programs/server/.gitignore b/programs/server/.gitignore
new file mode 100644
index 00000000000..ba8a531c6d7
--- /dev/null
+++ b/programs/server/.gitignore
@@ -0,0 +1,11 @@
+/access
+/dictionaries_lib
+/flags
+/format_schemas
+/metadata_dropped
+/preprocessed_configs
+/tmp
+/user_files
+
+status
+
diff --git a/programs/server/data/.gitignore b/programs/server/data/.gitignore
index 3e223bc0920..b9719d9d1d1 100644
--- a/programs/server/data/.gitignore
+++ b/programs/server/data/.gitignore
@@ -1,5 +1,3 @@
-*.bin
-*.mrk
 *.txt
 *.dat
 *.idx
diff --git a/programs/server/data/default/.gitignore b/programs/server/data/default/.gitignore
index 5d26e622e3e..e69de29bb2d 100644
--- a/programs/server/data/default/.gitignore
+++ b/programs/server/data/default/.gitignore
@@ -1,2 +0,0 @@
-*.bin
-*.mrk
diff --git a/programs/server/metadata/.gitignore b/programs/server/metadata/.gitignore
new file mode 100644
index 00000000000..d1b811b7de5
--- /dev/null
+++ b/programs/server/metadata/.gitignore
@@ -0,0 +1 @@
+*.sql