diff --git a/web/WEB-INF/cxf-beans.xml b/web/WEB-INF/cxf-beans.xml
index 9ca06f2..e35f881 100644
--- a/web/WEB-INF/cxf-beans.xml
+++ b/web/WEB-INF/cxf-beans.xml
@@ -1,30 +1,40 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-       xsi:schemaLocation="
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+	xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
 
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+	<import resource="classpath:META-INF/cxf/cxf.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
-    <jaxws:endpoint id="archiveservice"
-                    implementor="net.brutex.xservices.ws.impl.ArchiveServiceImpl"
-                    address="/ArchiveService"/>
+	<jaxws:endpoint id="archiveservice"
+		implementor="net.brutex.xservices.ws.impl.ArchiveServiceImpl" address="/ArchiveService" />
 
-    <jaxws:endpoint id="fileservice"
-                    implementor="net.brutex.xservices.ws.impl.FileServiceImpl"
-                    address="/FileService"/>
+	<jaxws:endpoint id="fileservice"
+		implementor="net.brutex.xservices.ws.impl.FileServiceImpl" address="/FileService">
+		<jaxws:properties>
+			<entry key="mtom-enabled" value="false" />
+		</jaxws:properties>
+	</jaxws:endpoint>
+	
+	<!-- This is the MTOM enabled FileServices endpoint -->
+	<jaxws:endpoint id="fileservice2"
+		implementor="net.brutex.xservices.ws.impl.FileServiceImpl" address="/FileServiceMTOM">
+		<jaxws:properties>
+			<entry key="mtom-enabled" value="true" />
+			<entry key="attachment-directory" value="c:\temp"/>
+			<entry key="attachment-memory-threshold" value="2000"/>
+		</jaxws:properties>
+	</jaxws:endpoint>
+	
+	
+	<jaxws:endpoint id="executeservice"
+		implementor="net.brutex.xservices.ws.impl.ExecuteServiceImpl" address="/ExecuteService" />
 
-    <jaxws:endpoint id="executeservice"
-                    implementor="net.brutex.xservices.ws.impl.ExecuteServiceImpl"
-                    address="/ExecuteService"/>
-                    
-    <jaxws:endpoint id="miscservice"
-                    implementor="net.brutex.xservices.ws.impl.MiscServiceImpl"
-                    address="/MiscService"/>
+	<jaxws:endpoint id="miscservice"
+		implementor="net.brutex.xservices.ws.impl.MiscServiceImpl" address="/MiscService" />
 </beans>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 696f845..1ce0252 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,32 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/cxf-beans.xml</param-value>
-    </context-param>
-  <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-
-    <servlet>
-        <servlet-name>XServices</servlet-name>
-        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>XServices</servlet-name>
-        <url-pattern>/*</url-pattern>
-
-    </servlet-mapping>
-
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>WEB-INF/cxf-beans.xml</param-value>
+  </context-param>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>XServices</servlet-name>
+    <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>XServices</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..47368df
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+<title>XServices</title>
+</head>
+<body><h1>
+XServices</h1></body>
+</html>
\ No newline at end of file