diff --git a/.classpath b/.classpath
index 4cea5050d..2c0010d7c 100644
--- a/.classpath
+++ b/.classpath
@@ -10,11 +10,6 @@
 	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/test/resources"/>
 	<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth/src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
diff --git a/.project b/.project
index 9e70fd3c0..04bd3391d 100644
--- a/.project
+++ b/.project
@@ -36,14 +36,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff --git a/spring-security-oauth b/spring-security-oauth
index 674ebf1fa..7f152e3b5 160000
--- a/spring-security-oauth
+++ b/spring-security-oauth
@@ -1 +1 @@
-Subproject commit 674ebf1fa71f4886216c01d731c6acdcd4e37d72
+Subproject commit 7f152e3b5a9d806ae410159b3235beb7f2672189