diff --git a/conf/nginx.conf b/conf/nginx.conf
index 07e063b5..37c46411 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -24,6 +24,16 @@ server {
 	root $ROOT;
 	index index.html index.htm;
 
+	location = /robots.txt {
+		log_not_found off;
+		access_log off;
+	}
+
+	location = /favicon.ico {
+		log_not_found off;
+		access_log off;
+	}
+
 	# Roundcube Webmail configuration.
 	rewrite ^/mail$ /mail/ redirect;
 	rewrite ^/mail/$ /mail/index.php;