diff --git a/src/main/java/de/thm/arsnova/WelcomeController.java b/src/main/java/de/thm/arsnova/WelcomeController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab9a692673bcc555dfb887aa8f6d23abe0ed89a6
--- /dev/null
+++ b/src/main/java/de/thm/arsnova/WelcomeController.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 THM webMedia
+ * 
+ * This file is part of ARSnova.
+ *
+ * ARSnova is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.thm.arsnova;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class WelcomeController {
+	@RequestMapping(method = RequestMethod.GET, value = "/")
+	public ModelAndView home(HttpServletRequest request) {
+		String referer = request.getHeader("referer");
+		String target = "index.html";
+		if (referer != null && referer.endsWith("dojo-index.html")) {
+			target = "dojo-index.html";
+		}
+		return new ModelAndView("redirect:/" + target);
+	}
+}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8efaa0b9d77f94ce57705ce6df73b958b7b8afa9..7965f9f53c0cc7b6b7b997e3218f8d297e17e9b6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -51,9 +51,6 @@
 	    <filter-name>characterEncodingFilter</filter-name>
 	    <url-pattern>/*</url-pattern>
 	</filter-mapping>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
 	<listener>
    		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
     </listener>