diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index 4d5b7bc5b01..6056b717e85 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -177,8 +177,14 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<!-- 
+							This project is built to 1.8 since our public
+							server runs on a 1.8 JDK. If you are using this
+							project as a basis for your own work, you could
+							probably safely reduce this if needed
+						-->
+						<source>1.8</source>
+						<target>1.8</target>
 					</configuration>
 				</plugin>
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
diff --git a/src/site/fml/hapi-fhir-faq.fml b/src/site/fml/hapi-fhir-faq.fml
index 6122d411250..87d90f4013e 100644
--- a/src/site/fml/hapi-fhir-faq.fml
+++ b/src/site/fml/hapi-fhir-faq.fml
@@ -81,6 +81,23 @@
 			</answer>
 		</faq>
 	</part>
+	<part id="Using HAPI">
+		<title>Using HAPI</title>
+		<faq id="jdk_version">
+			<question>
+				What JDK version does HAPI support?
+			</question>
+			<answer>
+				<p>
+					HAPI supports JDK 1.6 for the entire library, except for the CLI tool which is 1.8. 
+				</p>
+				<p>
+					Note that the HAPI library itself also requires a 1.8 JDK to build, since the unit tests 
+					have JDK 1.8 dependencies.
+				</p>
+			</answer>
+		</faq>
+	</part>
 	<part id="JPA Server">
 		<title>JPA Server</title>
 		<faq id="access_underlying_derby_database">