diff --git a/tools/idegen/README b/tools/idegen/README
index 3581a487c..d9444408e 100644
--- a/tools/idegen/README
+++ b/tools/idegen/README
@@ -6,11 +6,13 @@ If you're using IntelliJ...
 
     If this is your first time using IDEGen...
 
-        IDEA needs a lot of memory. Add "-Xms748m -Xmx748m" to your VM options
-        in "IDEA_HOME/bin/idea.vmoptions" on Linux or
-        "IntelliJ IDEA.app/Contents/Info.plist" on OS X.
+        Android is large, thus IDEA needs a lot of memory. Add "-Xms1g -Xmx5g" to
+        your VM options in "Help > Edit Custom VM" and increase the
+        file size limit in "Help -> Edit custom properties" by adding
+        "idea.max.intellisense.filesize=100000". Make sure to restart the IDE for
+        the new settings to take effect.
 
-        Create a JDK configuration named "1.7 (No Libraries)" by adding a new
+        Create a JDK configuration named "1.8 (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.
diff --git a/tools/idegen/templates/android.ipr b/tools/idegen/templates/android.ipr
index 1176a96ee..82841549a 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_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (No Libraries)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" project-jdk-name="1.8 (No Libraries)" project-jdk-type="JavaSDK">
     <output url="file:///tmp/intellij$PROJECT_DIR$/classes" />
   </component>
   <component name="RmicSettings">
diff --git a/tools/idegen/templates/idea/misc.xml b/tools/idegen/templates/idea/misc.xml
index cc11725d7..69d7b1946 100644
--- a/tools/idegen/templates/idea/misc.xml
+++ b/tools/idegen/templates/idea/misc.xml
@@ -40,7 +40,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
 </project>