diff --git a/api/src/main/java/org/openmrs/EncounterRole.java b/api/src/main/java/org/openmrs/EncounterRole.java
index 0d3f7564cac..d69d6cf6f7a 100644
--- a/api/src/main/java/org/openmrs/EncounterRole.java
+++ b/api/src/main/java/org/openmrs/EncounterRole.java
@@ -10,6 +10,15 @@
 package org.openmrs;
 
 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.Table;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 
 /**
  * An EncounterRole a role specific to the encounter. While these could match up to existing
@@ -17,12 +26,23 @@
  *
  * @since 1.9
  */
+@Entity
+@Table(name = "encounter_role")
+@BatchSize(size = 25)
 @Audited
 public class EncounterRole extends BaseChangeableOpenmrsMetadata {
 	
 	public static final String UNKNOWN_ENCOUNTER_ROLE_UUID = "a0b03050-c99b-11e0-9572-0800200c9a66";
 	
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "encounter_role_id_seq")
+	@GenericGenerator(
+			name = "encounter_role_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "encounter_role_encounter_role_id_seq")
+	)
+	@Column(name = "encounter_role_id", nullable = false)
 	private Integer encounterRoleId;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..ccb05824184 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -78,7 +78,6 @@
 		<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" />
 		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
deleted file mode 100644
index f77c87b7553..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
+++ /dev/null
@@ -1,51 +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="EncounterRole" table="encounter_role" batch-size="25">
-		<id name="encounterRoleId" type="int" column="encounter_role_id"
-			unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">encounter_role_encounter_role_id_seq</param>
-			</generator>
-		</id>
-
-		
-
-        <property name="name" type="java.lang.String" length="50" not-null="true" unique="true" />
-
-		<property name="description" type="java.lang.String" length="1024" />
-
-        <many-to-one name="creator" class="org.openmrs.User" not-null="true" />
-
-		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" />
-
-        <many-to-one name="changedBy" class="User" column="changed_by" />
-
-        <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
-
-		<property name="retired" type="java.lang.Boolean" length="1" not-null="true" />
-
-		<property name="dateRetired" type="java.util.Date" column="date_retired" not-null="false" length="19" />
-
-		<many-to-one name="retiredBy" class="org.openmrs.User" not-null="false" column="retired_by" />
-
-		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
-
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-	</class>
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c03825..a9591726818 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.EncounterRole;
 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(EncounterRole.class)
 			.getMetadataBuilder().build();