diff --git a/upload/cache/comments/.gitignore b/upload/cache/comments/.gitignore
index e69de29b..cec9082b 100755
--- a/upload/cache/comments/.gitignore
+++ b/upload/cache/comments/.gitignore
@@ -0,0 +1,3 @@
+*
+
+!.gitignore
diff --git a/upload/cache/userfeeds/.gitignore b/upload/cache/userfeeds/.gitignore
index e69de29b..cec9082b 100755
--- a/upload/cache/userfeeds/.gitignore
+++ b/upload/cache/userfeeds/.gitignore
@@ -0,0 +1,3 @@
+*
+
+!.gitignore
diff --git a/upload/files/conversion_queue/.gitignore b/upload/files/conversion_queue/.gitignore
index e69de29b..8edc2dad 100755
--- a/upload/files/conversion_queue/.gitignore
+++ b/upload/files/conversion_queue/.gitignore
@@ -0,0 +1,3 @@
+/*
+# But not these files...
+!.gitignore
\ No newline at end of file
diff --git a/upload/files/logs/.gitignore b/upload/files/logs/.gitignore
index e69de29b..6979ec96 100755
--- a/upload/files/logs/.gitignore
+++ b/upload/files/logs/.gitignore
@@ -0,0 +1,3 @@
+/*
+# But not these files...
+!.gitignore
diff --git a/upload/files/mass_uploads/.gitignore b/upload/files/mass_uploads/.gitignore
index e69de29b..cec9082b 100755
--- a/upload/files/mass_uploads/.gitignore
+++ b/upload/files/mass_uploads/.gitignore
@@ -0,0 +1,3 @@
+*
+
+!.gitignore
diff --git a/upload/files/original/.gitignore b/upload/files/original/.gitignore
index e69de29b..cec9082b 100755
--- a/upload/files/original/.gitignore
+++ b/upload/files/original/.gitignore
@@ -0,0 +1,3 @@
+*
+
+!.gitignore
diff --git a/upload/files/temp/.gitignore b/upload/files/temp/.gitignore
new file mode 100644
index 00000000..527bbcdc
--- /dev/null
+++ b/upload/files/temp/.gitignore
@@ -0,0 +1,4 @@
+/*
+# But not these files...
+!.gitignore
+!install.me
\ No newline at end of file
diff --git a/upload/files/thumbs/.gitignore b/upload/files/thumbs/.gitignore
new file mode 100644
index 00000000..ec535c64
--- /dev/null
+++ b/upload/files/thumbs/.gitignore
@@ -0,0 +1,4 @@
+/*
+# But not these files...
+!.gitignore
+!processing.jpg
\ No newline at end of file
diff --git a/upload/files/videos/.gitignore b/upload/files/videos/.gitignore
new file mode 100644
index 00000000..94850cf9
--- /dev/null
+++ b/upload/files/videos/.gitignore
@@ -0,0 +1,5 @@
+/*
+# But not these files...
+!.gitignore
+!no_video.flv
+!no_video.mp4
\ No newline at end of file