diff --git a/webgoat/README.txt b/webgoat/README.txt
index aa266e134..247ad922a 100644
--- a/webgoat/README.txt
+++ b/webgoat/README.txt
@@ -29,8 +29,8 @@ Don't forget to declare a classpath variable named M2_REPO, pointing to ~/.m2/re
 You can declare new variables in Eclipse in Windows -> Preferences... and selecting Java -> Build Path -> Classpath Variables
 
 
-Run the project on Tomcat within Eclipse
------------------------------------------
+Option 1: Run the project on Tomcat within Eclipse
+---------------------------------------------------
 1. Install a local Tomcat server
 2. Open Eclipse -> File -> New -> Other -> Server -> Apache -> Tomcat -> Next 
 -> Insert your Tomcat Installation directory
@@ -53,4 +53,9 @@ Run the project on Tomcat within Eclipse
 5. http://localhost:8080/webgoat/attack
 
 
+Option 2: Run the project on Tomcat with Maven
+---------------------------------------------------
+1. mvn tomcat:run-war
+2. http://localhost:8080/webgoat/attack
+
 
diff --git a/webgoat/src/main/tomcatconf/tomcat-users.xml b/webgoat/src/main/tomcatconf/tomcat-users.xml
new file mode 100644
index 000000000..0958a1636
--- /dev/null
+++ b/webgoat/src/main/tomcatconf/tomcat-users.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tomcat-users>
+	<role rolename="webgoat_basic"/>
+	<role rolename="webgoat_admin"/>
+	<role rolename="webgoat_user"/>
+	<role rolename="tomcat"/>
+	<user password="webgoat" roles="webgoat_admin" username="webgoat"/>
+	<user password="basic" roles="webgoat_user,webgoat_basic" username="basic"/>
+	<user password="tomcat" roles="tomcat" username="tomcat"/>
+	<user password="guest" roles="webgoat_user" username="guest"/>
+</tomcat-users>