diff --git a/api/src/main/java/org/openmrs/ConceptReferenceTerm.java b/api/src/main/java/org/openmrs/ConceptReferenceTerm.java
index 4959bfd4209a..191c550733fe 100644
--- a/api/src/main/java/org/openmrs/ConceptReferenceTerm.java
+++ b/api/src/main/java/org/openmrs/ConceptReferenceTerm.java
@@ -11,11 +11,20 @@
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-
+import javax.persistence.Entity;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import javax.persistence.Table;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import org.hibernate.annotations.GenericGenerator; 
+import org.hibernate.annotations.Parameter;
+import javax.persistence.OneToMany;
 
 /**
  * A concept reference term is typically name for a concept by which it is referred in another
@@ -25,21 +34,35 @@
  * @since 1.9
  */
 @Audited
+@Entity
+@Table(name = "concept_reference_term")
 public class ConceptReferenceTerm extends BaseChangeableOpenmrsMetadata {
 	
 	private static final long serialVersionUID = 1L;
 	
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE)
+	@GenericGenerator(
+			name = "concept_reference_term_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "concept_reference_term_concept_reference_term_id_seq")
+	)
+	@Column(name = "concept_reference_term_id")
 	private Integer conceptReferenceTermId;
 	
+	@Column(name = "concept_source_id", nullable = false)
 	private ConceptSource conceptSource;
 	
 	//The unique code used to identify the reference term in it's reference terminology
 	@Field(analyze = Analyze.NO)
+	@Column(name = "code", length = 255, nullable = false)
 	private String code;
 	
+	@Column(name = "version", length = 50)
 	private String version;
 	
+	@OneToMany(mappedBy = "conceptReferenceTerm" ,cascade = CascadeType.ALL, orphanRemoval = true)
 	private Set<ConceptReferenceTermMap> conceptReferenceTermMaps;
 	
 	/** default constructor */
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 1cad8cc6aa43..ad9589de0629 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -38,7 +38,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptSource.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml
deleted file mode 100644
index 064ccd28e4f4..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml
+++ /dev/null
@@ -1,62 +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="ConceptReferenceTerm" table="concept_reference_term">
-
-		<id name="conceptReferenceTermId" type="java.lang.Integer" column="concept_reference_term_id">
-			<generator class="native">
-				<param name="sequence">concept_reference_term_concept_reference_term_id_seq</param>
-			</generator>
-		</id>
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true" />
-
-		<many-to-one name="conceptSource" column="concept_source_id" class="ConceptSource" not-null="true"/>
-					
-		<property name="code" type="java.lang.String" column="code" length="255" not-null="true" />
-		
-		<property name="name" type="java.lang.String" column="name" length="255" update="true" />
-		
-		<property name="version" type="java.lang.String" column="version" length="50" />
-		
-		<property name="description" type="java.lang.String" column="description" length="255" />
-		
-		<many-to-one name="creator" class="User" column="creator" not-null="true" />
-		
-		<property name="dateCreated" type="java.util.Date" column="date_created" length="19" not-null="true"/>
-		
-		<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" column="retired" length="1" not-null="true"/>
-		
-		<many-to-one name="retiredBy" class="User" column="retired_by" />
-		
-		<property name="dateRetired" type="java.util.Date" column="date_retired" length="19" />
-		
-		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
-		
-		<set name="conceptReferenceTermMaps" inverse="true" cascade="all-delete-orphan, delete">
-			<key column="term_a_id" not-null="true" />
-			<one-to-many class="ConceptReferenceTermMap" />
-		</set>
-
-	</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 12f636a67082..93878baa19f6 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2742,6 +2742,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(ConceptReferenceTerm.class)
 			.getMetadataBuilder().build();