diff --git a/api/src/main/java/org/openmrs/EncounterProvider.java b/api/src/main/java/org/openmrs/EncounterProvider.java
index cf4ee70141d..584763fa340 100644
--- a/api/src/main/java/org/openmrs/EncounterProvider.java
+++ b/api/src/main/java/org/openmrs/EncounterProvider.java
@@ -9,24 +9,53 @@
  */
 package org.openmrs;
 
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
 /**
  * Mapping Class between Encounters and Providers which allows many to many relationship.
  * 
  * @since 1.9
  */
+@Entity
+@Table(name = "encounter_provider")
+@BatchSize(size = 25)
 @Audited
 public class EncounterProvider extends BaseChangeableOpenmrsData {
 	
 	public static final long serialVersionUID = 1L;
-	
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "encounter_provider_id_seq")
+	@GenericGenerator(
+		name = "encounter_provider_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "encounter_provider_encounter_provider_id_seq")
+	)
+	@Column(name = "encounter_provider_id")
 	private Integer encounterProviderId;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "encounter_id", nullable = false)
 	private Encounter encounter;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "provider_id", nullable = false)
 	private Provider provider;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "encounter_role_id", nullable = false)
 	private EncounterRole encounterRole;
 	
 	public void setEncounterProviderId(Integer encounterProviderId) {
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..c81e5407c44 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -77,7 +77,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/LocationTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterType.hbm.xml" />
-        <mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterRole.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml
deleted file mode 100644
index 8471185e7e1..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.openmrs">
-
-	<class name="EncounterProvider" table="encounter_provider"
-		batch-size="25">
-
-		<id name="encounterProviderId" type="int" column="encounter_provider_id"
-			unsaved-value="undefined">
-			<generator class="native">
-				<param name="sequence">encounter_provider_encounter_provider_id_seq</param>
-			</generator>
-		</id>
-
-		<property name="uuid" type="java.lang.String" column="uuid"
-			length="38" unique="true" />
-			
-		<property name="dateCreated" type="java.util.Date" column="date_created"
-			not-null="true" length="19" />
-		<property name="voided" type="java.lang.Boolean" column="voided"
-			length="1" not-null="true" />
-		<property name="dateVoided" type="java.util.Date" column="date_voided"
-			length="19" />
-		<property name="voidReason" type="java.lang.String" column="void_reason"
-			length="255" />
-		<property name="dateChanged" type="java.util.Date" column="date_changed"
-			not-null="false" length="19" />
-
-		<!-- Associations -->
-		<many-to-one name="changedBy" class="User" column="changed_by" />
-
-		<many-to-one name="creator" class="User" not-null="true" />
-
-		<many-to-one name="voidedBy" class="User">
-			<column name="voided_by" />
-		</many-to-one>
-
-		<!-- bi-directional many-to-one association to Provider -->
-
-		<many-to-one name="provider" class="Provider" not-null="true">
-			<column name="provider_id" />
-		</many-to-one>
-
-		<!-- bi-directional many-to-one association to Encounter -->
-
-		<many-to-one name="encounter" class="Encounter" not-null="true">
-			<column name="encounter_id" />
-		</many-to-one>
-
-		<!-- bi-directional many-to-one association to Encounter Role -->
-
-		<many-to-one name="encounterRole" class="EncounterRole"
-			not-null="true">
-			<column name="encounter_role_id" />
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c03825..e5c7b5169c1 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -35,6 +35,7 @@
 import org.openmrs.DrugIngredient;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
+import org.openmrs.EncounterProvider;
 import org.openmrs.FreeTextDosingInstructions;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(EncounterProvider.class)
 			.getMetadataBuilder().build();