diff --git a/tools/idegen/README b/tools/idegen/README
index 02bb5935a..3581a487c 100644
--- a/tools/idegen/README
+++ b/tools/idegen/README
@@ -10,7 +10,7 @@ If you're using IntelliJ...
         in "IDEA_HOME/bin/idea.vmoptions" on Linux or
         "IntelliJ IDEA.app/Contents/Info.plist" on OS X.
 
-        Create a JDK configuration named "1.6 (No Libraries)" by adding a new
+        Create a JDK configuration named "1.7 (No Libraries)" by adding a new
         JDK like you normally would and then removing all of the jar entries
         under the "Classpath" tab. This will ensure that you only get access to
         Android's core libraries and not those from your desktop VM.
@@ -36,7 +36,7 @@ If you're using Eclipse...
         Edit eclipse.ini ("Eclipse.app/Contents/MacOS/eclipse.ini" on OS X) and
         add "-Xms748m -Xmx748m" to your VM options.
 
-        Configure a JRE named "1.5 (No Libraries)" under "Preferences -> Java ->
+        Configure a JRE named "1.7 (No Libraries)" under "Preferences -> Java ->
         Installed JREs". Remove all of the jar entries underneath "JRE system
         libraries". Eclipse will not let you save your configuration unless at
         least one jar is present, so include a random jar that won't get in the
diff --git a/tools/idegen/idegen.ipr b/tools/idegen/idegen.ipr
index 75771b508..ef1c6aec7 100644
--- a/tools/idegen/idegen.ipr
+++ b/tools/idegen/idegen.ipr
@@ -298,7 +298,7 @@
       <module fileurl="file://$PROJECT_DIR$/idegen.iml" filepath="$PROJECT_DIR$/idegen.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (no libraries)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (no libraries)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
   <component name="RmicSettings">
diff --git a/tools/idegen/templates/android.ipr b/tools/idegen/templates/android.ipr
index f857d4aa2..1176a96ee 100644
--- a/tools/idegen/templates/android.ipr
+++ b/tools/idegen/templates/android.ipr
@@ -281,7 +281,7 @@
       <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (No Libraries)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (No Libraries)" project-jdk-type="JavaSDK">
     <output url="file:///tmp/intellij$PROJECT_DIR$/classes" />
   </component>
   <component name="RmicSettings">