diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
index b0e1171a610..c7348883b47 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -190,6 +190,21 @@
 			<groupId>com.phloc</groupId>
 			<artifactId>phloc-commons</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.3.0</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.fusesource.jansi</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f04d4baa4cd..683fc465f4e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -67,6 +67,13 @@
 				accommodate future needs which means that this should be the last
 				time we have to change it.
 			</action>
+			<action type="fix" issue="838">
+				The HAPI-FHIR-CLI now explicitly includes JAXB dependencies in its combined JAR
+				file. These were not neccesary prior to Java 9, but the JDK (mercifully) does
+				not include JAXB in the default classpath as of Java 9. This means that
+				it is possible to perform Schematron validation on Java 9. Thanks to
+				Mark Grimes for reporting and suggesting a fix!
+			</action>
 		</release>
 		<release version="3.2.0" date="2018-01-13">
 			<action type="add">