diff --git a/.gitignore b/.gitignore
index 48edbfd9153..569829f901b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,8 @@ Thumbs.db
 .buildpath
 .project
 .settings*
-sftp-config.json
\ No newline at end of file
+sftp-config.json
+
+# Ignore all log files except for .htaccess
+/logs/*
+!/logs/.htaccess