diff --git a/etc/apache2/dedicated_vhost.conf b/etc/apache2/dedicated_vhost.conf
index 0f85fa7..de60a3b 100644
--- a/etc/apache2/dedicated_vhost.conf
+++ b/etc/apache2/dedicated_vhost.conf
@@ -19,4 +19,21 @@
 	WSGIDaemonProcess	mumble-django threads=25
 	WSGIProcessGroup	mumble-django
 	WSGIScriptReloading	Off
+	
+	# Cache optimization - not necessarily needed for MD, but nice to have :)
+	FileETag None
+	<IfModule mod_headers.c>
+		Header unset ETag
+		
+		<FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$">
+			Header set Cache-Control "max-age=86400, must-revalidate"
+		</FilesMatch>
+		
+		<IfModule mod_deflate.c>
+			# compress content
+			AddOutputFilterByType DEFLATE text/html text/plain text/css text/javascript image/png image/jpeg image/gif
+			# properly handle requests coming from behind proxies
+			Header append Vary User-Agent
+		</IfModule>
+	</IfModule>
 </VirtualHost>
diff --git a/etc/apache2/shared_vhost.conf b/etc/apache2/shared_vhost.conf
index 388d1d2..50eaa5b 100644
--- a/etc/apache2/shared_vhost.conf
+++ b/etc/apache2/shared_vhost.conf
@@ -31,4 +31,20 @@
 	
 	# ----------->8--------- cut here
 	
+	# Cache optimization - not necessarily needed for MD, but nice to have :)
+	FileETag None
+	<IfModule mod_headers.c>
+		Header unset ETag
+		
+		<FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$">
+			Header set Cache-Control "max-age=86400, must-revalidate"
+		</FilesMatch>
+		
+		<IfModule mod_deflate.c>
+			# compress content
+			AddOutputFilterByType DEFLATE text/html text/plain text/css text/javascript image/png image/jpeg image/gif
+			# properly handle requests coming from behind proxies
+			Header append Vary User-Agent
+		</IfModule>
+	</IfModule>
 </VirtualHost>