diff --git a/.gitignore b/.gitignore
index 6026e94..8f6281f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,18 @@ mermsemr/src/include/php_mermsemr_config.h
 mermsemr/src/include/php_mermsemr_log.h
 mermsemr/src/include/php_tmpl_prefix.h
 mermsemr/src/mailsend/mailsend
+mermsemr/src/autom4te.cache
+mermsemr/src/confdefs.h
+mermsemr/src/config.*
+mermsemr/src/configure*
+mermsemr/src/core/mermsemr_api.cc
+mermsemr/src/include/php_mermsemr_api.h
+mermsemr/src/include/php_mermsemr_api_ns.h
+mermsemr/src/libtool
+
+*.swm
+*.swn
+*.swb
+*.swo
+*.swp
+
diff --git a/mermsemr/src/mailsend/.gitignore b/mermsemr/src/mailsend/.gitignore
new file mode 100644
index 0000000..e5bef36
--- /dev/null
+++ b/mermsemr/src/mailsend/.gitignore
@@ -0,0 +1,12 @@
+*.o
+*.obj
+*.a
+config.log
+config.status
+Makefile
+mkey.c
+mailsend
+mailsend.exe
+*.lib
+*.deb
+*.gz