diff --git a/src/main/java/com/faforever/api/config/MvcConfig.java b/src/main/java/com/faforever/api/config/MvcConfig.java
index c0b235d3a..9709d9a3d 100644
--- a/src/main/java/com/faforever/api/config/MvcConfig.java
+++ b/src/main/java/com/faforever/api/config/MvcConfig.java
@@ -21,5 +21,7 @@ public void addViewControllers(ViewControllerRegistry registry) {
   public void addResourceHandlers(ResourceHandlerRegistry registry) {
     registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
     registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    registry.addResourceHandler("/favicon.ico").addResourceLocations("/");
+    registry.addResourceHandler("/robots.txt").addResourceLocations("/");
   }
 }
diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico
new file mode 100644
index 000000000..dc873cd77
Binary files /dev/null and b/src/main/webapp/favicon.ico differ
diff --git a/src/main/webapp/robots.txt b/src/main/webapp/robots.txt
new file mode 100644
index 000000000..1f53798bb
--- /dev/null
+++ b/src/main/webapp/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /