diff --git a/api/src/main/java/org/openmrs/ConceptDescription.java b/api/src/main/java/org/openmrs/ConceptDescription.java
index dd476facdf70..5da47e4d8305 100644
--- a/api/src/main/java/org/openmrs/ConceptDescription.java
+++ b/api/src/main/java/org/openmrs/ConceptDescription.java
@@ -13,30 +13,62 @@
 
 import java.util.Date;
 import java.util.Locale;
+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;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 
 /**
  * ConceptDescription is the localized description of a concept.
  */
+@Entity
+@Table(name = "concept_description")
+@BatchSize(size = 10)
 @Audited
 public class ConceptDescription extends BaseOpenmrsObject implements Auditable, java.io.Serializable {
 	
 	private static final long serialVersionUID = -7223075113369136584L;
 	
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "concept_description_id_seq")
+	@GenericGenerator(
+			name = "concept_description_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "concept_description_concept_description_id_seq")
+			)
+	@Column(name = "concept_description_id", nullable = false)
 	private Integer conceptDescriptionId;
 	
+	@ManyToOne
+	@JoinColumn(name = "concept_id", nullable = false)
 	private Concept concept;
 	
+	@Column(name = "description", length = 65535, nullable = false)
 	private String description;
 	
+	@Column(name = "locale", length = 50, nullable = false)
 	private Locale locale;
 	
+	@ManyToOne
+	@JoinColumn(name = "creator", nullable = false)
 	private User creator;
 	
+	@Column(name = "date_created", nullable = false)
 	private Date dateCreated;
 	
+	@ManyToOne
+	@JoinColumn(name = "changed_by", nullable = true)
 	private User changedBy;
 	
+	@Column(name = "date_changed", nullable = true)
 	private Date dateChanged;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..df9866d6d1fd 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -27,7 +27,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptClass.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml
deleted file mode 100644
index d78a95c179dd..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml
+++ /dev/null
@@ -1,42 +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="ConceptDescription" table="concept_description" batch-size="10">
-
-		<id name="conceptDescriptionId" type="int" column="concept_description_id">
-			<generator class="native">
-				<param name="sequence">concept_description_concept_description_id_seq</param>
-			</generator>
-		</id>
-
-		<many-to-one
-			name="concept"
-			column="concept_id"
-			class="Concept"
-		not-null="true"/>
-		
-		<property name="description" type="text" length="65535" not-null="true"/>
-		<property name="locale" type="java.util.Locale" length="50" not-null="true"/>
-		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true"/>
-		<many-to-one name="creator" class="User" column="creator" not-null="true"/>
-		<property name="dateChanged" type="java.util.Date" column="date_changed" not-null="false"/>
-		<many-to-one name="changedBy" class="User" column="changed_by" not-null="false"/>
-
-		<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 6d553c038256..cfde221aa6d6 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2740,6 +2740,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(ConceptDescription.class)
 			.getMetadataBuilder().build();