diff --git a/.gitignore b/.gitignore
index f2e96d3eb6..83a53dfa3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
@@ -10,3 +12,4 @@ dataobject.ini
 *.orig
 *.rej
 .#*
+*.swp