diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
index 31d57fafb14..d37c8a1d817 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
@@ -83,16 +83,6 @@
 		</dependency>
 
 		<!-- Used for CORS support -->
-		<dependency>
-			<groupId>org.ebaysf.web</groupId>
-			<artifactId>cors-filter</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>servlet-api</artifactId>
-					<groupId>javax.servlet</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 
 		<!-- Spring Web is used to deploy the server to a web container. -->
 		<dependency>
@@ -158,6 +148,10 @@
 			<artifactId>phloc-schematron</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/webapp/WEB-INF/web.xml
index a77904866c6..dd56fbedd0f 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/webapp/WEB-INF/web.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/webapp/WEB-INF/web.xml
@@ -66,7 +66,7 @@
 	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
 	<filter>
 		<filter-name>CORS Filter</filter-name>
-		<filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
+		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
 		<init-param>
 			<description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description>
 			<param-name>cors.allowed.origins</param-name>
diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml
index b770783e3dc..39d509f53a1 100644
--- a/hapi-fhir-jpaserver-example/pom.xml
+++ b/hapi-fhir-jpaserver-example/pom.xml
@@ -93,18 +93,6 @@
 			<artifactId>thymeleaf</artifactId>
 		</dependency>
 
-		<!-- Used for CORS support -->
-		<dependency>
-			<groupId>org.ebaysf.web</groupId>
-			<artifactId>cors-filter</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>servlet-api</artifactId>
-					<groupId>javax.servlet</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<!-- Spring Web is used to deploy the server to a web container. -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -163,6 +151,17 @@
 			<artifactId>phloc-schematron</artifactId>
 		</dependency>
 
+		<!-- 
+		Used for CORS support 
+		If you are deploying your project to Apache Tomcat, you can 
+		comment this dependency out since the tomcat CORS filter will
+		already be available on the classpath
+		-->
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
index c81a6f602d0..76e37b9e959 100644
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
+++ b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
@@ -57,12 +57,10 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-
-
 	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
 	<filter>
 		<filter-name>CORS Filter</filter-name>
-		<filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
+		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
 		<init-param>
 			<description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description>
 			<param-name>cors.allowed.origins</param-name>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index 8cd98261ee8..a4fe817a222 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -159,14 +159,15 @@
 			<artifactId>commons-dbcp2</artifactId>
 		</dependency>
 
-		<!-- Only required for CORS support -->
-		<dependency>
-			<groupId>org.ebaysf.web</groupId>
-			<artifactId>cors-filter</artifactId>
-		</dependency>
+		<!-- 
+		Only required for CORS support - Change the scope from
+		"provided" to "compile" if you are deploying to something
+		other than Tomcat 
+		-->
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 	</dependencies>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml
index ffdf80ad89b..b7f03fb93f2 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml
@@ -161,7 +161,7 @@
 	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
 	<filter>
 		<filter-name>CORS Filter</filter-name>
-		<filter-class>ca.uhn.fhirtest.CORSFilter_</filter-class>
+		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
 		<init-param>
 			<description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description>
 			<param-name>cors.allowed.origins</param-name>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 08f981fe1f4..f937ee03a07 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -29,6 +29,13 @@
 				fails to detect the presents of DSTU3 structures. Thanks
 				to GitHub user @vijayt27 for reporting!
 			</action>
+			<action type="add">
+				All server examples as well as the CLI have been
+				switched from using eBay's CORS filter to using
+				the Apache Tomcat CORS filter instead. The former
+				has become unmaintained and has unfixed bugs so
+				it is no longer recommended for use.
+			</action>
 		</release>
 		<release version="2.1" date="2016-11-11">
 			<action type="add">