diff --git a/.gitignore b/.gitignore
index 1d43b14c3..49e80b6e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 ### TorrentPier ###
 .idea/
-data/avatars/**/
+data/avatars/
 data/old_files/
 data/torrent_files/
 internal_data/ajax_html/*.html
@@ -31,4 +31,6 @@ $RECYCLE.BIN/
 .LSOverride
 ._*
 .Spotlight-V100
-.Trashes
\ No newline at end of file
+.Trashes
+*.orig
+*.rej
\ No newline at end of file