diff --git a/api/pom.xml b/api/pom.xml
index 7b00eb07d..cf1acbf36 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -111,6 +111,11 @@
 			<artifactId>htmlformentry-api-1.10</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>htmlformentry-api-2.0</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>htmlformentryui-api</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index ecf957e4c..f494cd50d 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -120,6 +120,11 @@
 			<artifactId>htmlformentry-api-1.10</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>htmlformentry-api-2.0</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>htmlformentryui-api</artifactId>
diff --git a/pom.xml b/pom.xml
index c24355b31..d0646a40c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,8 @@
 		<formfilterVersion>1.0.0</formfilterVersion>
 		<htmlformentryuiVersion>1.6.4</htmlformentryuiVersion>
 		<htmlformentryVersion>3.3.2</htmlformentryVersion>
+		<htmlformentryuiVersion>1.6.3</htmlformentryuiVersion>
+		<htmlformentryVersion>3.6.0</htmlformentryVersion>
 		<htmlwidgetsVersion>1.9.0</htmlwidgetsVersion>
 		<idgenVersion>4.4.0</idgenVersion>
 		<jacksonVersion>1.8.3</jacksonVersion>
@@ -271,6 +273,13 @@
 				<scope>test</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.openmrs.module</groupId>
+				<artifactId>htmlformentry-api-2.0</artifactId>
+				<version>${htmlformentryVersion}</version>
+				<scope>test</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.openmrs.module</groupId>
 				<artifactId>idgen-api</artifactId>