diff --git a/pom.xml b/pom.xml
index 269648f4477..8c088dfe880 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,6 +325,10 @@
 		<developer>
 			<id>elnin0815</id>
 		</developer>
+		<developer>
+			<id>dangerousben</id>
+			<name>Ben Spencer</name>
+		</developer>
 	</developers>
 
 	<licenses>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2583852313c..23c2eaf92ec 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -95,7 +95,11 @@
 				Thanks to Sebastien Riviere for the 
 				pull request!
 			</action>
-	
+			<action type="fix" issue="610">
+				Fix a potential race condition when the FhirContext is being accessed by many threads
+				at the same time right as it is initializing. Thanks to Ben Spencer for the
+				pull request!
+			</action>
 		</release>
 		<release version="2.3" date="2017-03-18">
 			<action type="add">