diff --git a/build-windows-installer.xml b/build-windows-installer.xml
index e3f0401632..b82e28ca24 100755
--- a/build-windows-installer.xml
+++ b/build-windows-installer.xml
@@ -109,7 +109,7 @@
         <var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
         <var name="aut-bin-name" value="${app.name}.exe"/>
 
-        <var name="jvm.max.mem" value="512" />
+        <var name="jvm.max.mem" value="512m" />
         
         <var name="jre-path" value="${env.JRE_HOME_32}"/>
         <antcall target="copyJRE" inheritAll="true" />
@@ -144,7 +144,7 @@
         <var name="aut-bin-name" value="${app.name}64.exe"/>
         <var name="aut-bin-name-todelete" value="${app.name}.exe"/>
         
-        <var name="jvm.max.mem" value="2048"/>
+        <var name="jvm.max.mem" value="4G"/>
         
         <var name="jre-path" value="${env.JRE_HOME_64}"/>
         <antcall target="copyJRE" inheritAll="true" />
@@ -170,7 +170,7 @@
         <!-- Update configuration file to include jre -->
         <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
         <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
-        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none -J-XX:+UseG1GC -J-XX:+UseStringDeduplication &quot;" />
+        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem} -J-XX:MaxPermSize=128M -J-Xverify:none -J-XX:+UseG1GC -J-XX:+UseStringDeduplication &quot;" />
         <propertyfile file="${inst.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
diff --git a/build.xml b/build.xml
index bba4207f1b..4eaa7df1c8 100755
--- a/build.xml
+++ b/build.xml
@@ -92,7 +92,7 @@
 
         <property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />
         <!-- for Japanese localized version add option:  -Duser.language=ja -->        
-        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none -J-XX:+UseG1GC -J-XX:+UseStringDeduplication -J-Xdock:name=${app.title}&quot;" />
+        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx4G -J-XX:MaxPermSize=128M -J-Xverify:none -J-XX:+UseG1GC -J-XX:+UseStringDeduplication -J-Xdock:name=${app.title}&quot;" />
         <propertyfile file="${app.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
diff --git a/docs/doxygen-user/images/runtime_settings.PNG b/docs/doxygen-user/images/runtime_settings.PNG
new file mode 100644
index 0000000000..1d02f96a42
Binary files /dev/null and b/docs/doxygen-user/images/runtime_settings.PNG differ
diff --git a/docs/doxygen-user/installation.dox b/docs/doxygen-user/installation.dox
index c924708201..aa67e55d7a 100755
--- a/docs/doxygen-user/installation.dox
+++ b/docs/doxygen-user/installation.dox
@@ -6,12 +6,16 @@
 It is _highly_ recommended to remove or disable any antivirus software from computers that will be processing or reviewing cases. Antivirus software will often conflict with forensic software, and may quarantine or even delete some of your results before you get a chance to look at them.
 <br><br>
 
-
 \section install Deployment Types
 Starting with Autopsy 4.0, there are two ways to deploy Autopsy:
 - **Single-User**: Cases can be open by only a single instance of Autopsy at a time.  Autopsy installations do not communicate with each other.  This is the easiest to install and deploy.  This page outlines that installation process. 
 - **Multi-User**: Cases can be open by multiple users at the same time and users can see what each other is doing. This collaborative deployment requires installation and configuration of other network-based services. The installation of this deployment is covered in \ref install_multiuser_page.
 
+\section sysreqs System Memory Requirements
+The 64 bit version of Autopsy requires a minimum of 8GB RAM (16 GB recommended).
+When the 64 bit version of Autopsy is installed on Windows it will be limited to a maximum heap size of 4GB leaving the remaining memory for the operating system, the internal Solr text indexing service and other applications. If you wish to change the maximum heap size you can do so after installation by changing the Maximum JVM Memory value in the Runtime section under Tools -> Options -> Application.
+
+\image html runtime_settings.PNG
 
 \section download Download
 Download Autopsy from the website: