diff --git a/.classpath b/.classpath
index c9a462de19e..a17f3dd83c4 100644
--- a/.classpath
+++ b/.classpath
@@ -3,16 +3,7 @@
 	<classpathentry excluding="org/jruby/runtime/Constants.java" kind="src" path="src"/>
 	<classpathentry excluding="*.java" kind="src" path="src_gen"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<accessrules>
-			<accessrule kind="accessible" pattern="javax/script/**"/>
-			<accessrule kind="discouraged" pattern="sun/misc/Unsafe"/>
-			<accessrule kind="discouraged" pattern="sun/misc/Signal"/>
-			<accessrule kind="discouraged" pattern="sun/misc/SignalHandler"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="lib" path="build_lib/junit.jar"/>
-	<classpathentry kind="lib" path="build_lib/jline-2.7-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="build_lib/bsf.jar"/>
 	<classpathentry kind="lib" path="build_lib/joni.jar"/>
 	<classpathentry kind="lib" path="build_lib/bytelist.jar"/>
@@ -44,5 +35,7 @@
 	<classpathentry kind="lib" path="build_lib/jnr-enxio.jar"/>
 	<classpathentry kind="lib" path="build_lib/bcmail-jdk15-146.jar"/>
 	<classpathentry kind="lib" path="build_lib/bcprov-jdk15-146.jar"/>
+	<classpathentry kind="lib" path="build_lib/jline-2.7.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build.eclipse"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.launching.prefs b/.settings/org.eclipse.jdt.launching.prefs
index 5d77195a39c..d211d326335 100644
--- a/.settings/org.eclipse.jdt.launching.prefs
+++ b/.settings/org.eclipse.jdt.launching.prefs
@@ -1,2 +1,2 @@
-#Wed Jan 20 17:53:12 CET 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning