diff --git a/README.md b/README.md
index 36616f177404043249e837d25386483d2fe54ddb..d6d63e6add5e162dad365ed5cf30ba762b66b328 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,10 @@ Both versions of ARSnova will be deployed alongside each other, so you get to ch
 
 ## Deployment
 
-You will need to do some configuration work upfront. Currently, you need to create a file named `config.properties` inside the `src/main/webapp` folder. The easiest way of doing this is to copy the provided `config.properties.example` and to rename it accordingly. These defaults should get you started.
+You will need to do some configuration work upfront.
+
+ * Add a new directory "arsnova" in /etc and create a copy of arsnova.properties.example named arsnova.properties in this directory.
+ * Change settings to match your environment
 
 ## Server configuration
 
diff --git a/src/main/webapp/WEB-INF/spring/spring-main.xml b/src/main/webapp/WEB-INF/spring/spring-main.xml
index 7deec54b52ac461363f91502bf27edfa975f332f..688a7fd235090578595fe4911afa2e8f7e62541f 100644
--- a/src/main/webapp/WEB-INF/spring/spring-main.xml
+++ b/src/main/webapp/WEB-INF/spring/spring-main.xml
@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<bean id="propertyPlaceholderConfigurer"
-	    class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" 
-	    p:ignoreUnresolvablePlaceholders="false"
-	    p:ignoreResourceNotFound="true">
-	    <property name="locations" >
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+		p:ignoreUnresolvablePlaceholders="false" p:ignoreResourceNotFound="true">
+		<property name="locations">
 			<list>
-                <value>config.properties</value>
-                <value>file:///etc/arsnova.config</value>
-            </list>
+				<value>arsnova.properties.example</value>
+				<value>file:///etc/arsnova/arsnova.properties</value>
+			</list>
 		</property>
 	</bean>
-	
-	<util:properties id="props" location="config.properties"/>
-    
+
+	<util:properties id="props"
+		location="file:///etc/arsnova/arsnova.properties" />
+
 	<import resource="spring-security.xml" />
-	
+
 	<context:component-scan base-package="de.thm.arsnova" />
 	<context:annotation-config />
 
-	<bean id="socketServer" class="de.thm.arsnova.socket.ARSnovaSocketIOServer" init-method="startServer" destroy-method="stopServer" scope="singleton"
-		p:portNumber="10443"
-		p:useSSL="${security.ssl}"
-		p:keystore="${security.keystore}"
+	<bean id="socketServer" class="de.thm.arsnova.socket.ARSnovaSocketIOServer"
+		init-method="startServer" destroy-method="stopServer" scope="singleton"
+		p:portNumber="10443" p:useSSL="${security.ssl}" p:keystore="${security.keystore}"
 		p:storepass="${security.storepass}" />
 
 </beans>
diff --git a/src/main/webapp/config.properties.example b/src/main/webapp/arsnova.properties.example
similarity index 100%
rename from src/main/webapp/config.properties.example
rename to src/main/webapp/arsnova.properties.example