diff --git a/api/src/main/java/org/openmrs/Drug.java b/api/src/main/java/org/openmrs/Drug.java
index 1fd5adb86668..b9564dd5dddd 100644
--- a/api/src/main/java/org/openmrs/Drug.java
+++ b/api/src/main/java/org/openmrs/Drug.java
@@ -22,38 +22,73 @@
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
 import org.openmrs.api.context.Context;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 
 /**
  * Drug
  */
 @Indexed
 @Audited
+@Entity
+@Table(name = "drug")
 public class Drug extends BaseChangeableOpenmrsMetadata {
 	
 	public static final long serialVersionUID = 285L;
 	
 	// Fields
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "drug_id_seq")
+	@GenericGenerator(
+			name = "drug_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "drug_drug_id_seq")
+			)
+	@Column(name = "drug_id", nullable = false)
 	private Integer drugId;
 	
+	@Column(name = "combination", length = 1, nullable = false)
 	private Boolean combination = false;
 	
+	@ManyToOne
+	@JoinColumn(name = "dosage_form", nullable = true)
 	private Concept dosageForm;
 	
+	@Column(name = "maximum_daily_dose", length = 22)
 	private Double maximumDailyDose;
 	
+	@Column(name = "minimum_daily_dose", length = 22)
 	private Double minimumDailyDose;
 	
+	@Column(name = "strength", length = 255)
 	private String strength;
 	
+	@ManyToOne
+	@JoinColumn(name = "dose_limit_units", nullable = true)
 	private Concept doseLimitUnits;
 	
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
+	@ManyToOne
+	@JoinColumn(name = "concept_id", nullable = false)
 	private Concept concept;
 	
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
+	@OneToMany(mappedBy = "drug", cascade = CascadeType.ALL, orphanRemoval = true)
 	private Set<DrugReferenceMap> drugReferenceMaps;
 	
+	@OneToMany(mappedBy = "drug", fetch = FetchType.LAZY)
 	private Collection<DrugIngredient> ingredients;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..b3cce97d08ef 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -42,7 +42,6 @@
 		<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" />
-		<mapping resource="org/openmrs/api/db/hibernate/Drug.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
deleted file mode 100644
index dfbf404db43c..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
+++ /dev/null
@@ -1,92 +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>
-	<class name="org.openmrs.Drug" table="drug">
-
-		<id name="drugId" type="java.lang.Integer" column="drug_id">
-			<generator class="native">
-				<param name="sequence">drug_drug_id_seq</param>
-			</generator>
-		</id>
-		
-		<property name="name" type="java.lang.String" length="255" />
-		<property name="combination" type="java.lang.Boolean" length="1"
-			not-null="true" />
-		<property name="maximumDailyDose" type="java.lang.Double"
-			column="maximum_daily_dose" length="22" />
-		<property name="minimumDailyDose" type="java.lang.Double"
-			column="minimum_daily_dose" length="22" />
-        <property name="strength" type="java.lang.String" length="255" />
-		<property name="dateCreated" type="java.util.Date"
-			column="date_created" not-null="true" length="19" />
-			
-		<many-to-one name="changedBy" class="org.openmrs.User">
-			<column name="changed_by" />
-		</many-to-one>
-
-		<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" />
-		<property name="retireReason" type="java.lang.String"
-			column="retire_reason" length="255" />
-
-		<many-to-one name="concept" class="org.openmrs.Concept"
-			not-null="true" column="concept_id" />
-		<many-to-one name="dosageForm" class="org.openmrs.Concept"
-			not-null="false" column="dosage_form" />
-		<many-to-one name="doseLimitUnits" class="org.openmrs.Concept"
-		    not-null="false" column="dose_limit_units" />
-
-		<set name="ingredients" lazy="true" inverse="true">
-			<key column="drug_id" />	
-			<one-to-many class="org.openmrs.DrugIngredient" />
-		</set>
-
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-		<!-- bi-directional one-to-many association to DrugOrder -->
-		<!--
-			<set
-			name="drugOrders"
-			lazy="true"
-			inverse="true"
-			cascade="none"
-			>
-			<key>
-			<column name="drug_inventory_id" />
-			</key>
-			<one-to-many 
-			class="org.openmrs.DrugOrder"
-			/>
-			</set>
-		-->
-		<many-to-one name="creator" class="org.openmrs.User"
-			not-null="true" />
-		<many-to-one name="retiredBy" class="org.openmrs.User"
-			not-null="false" column="retired_by" />
-
-		<set name="drugReferenceMaps" inverse="true" cascade="all,delete-orphan,evict">
-			<key column="drug_id" />
-			<one-to-many class="org.openmrs.DrugReferenceMap" />
-		</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 6d553c038256..9a787a6ec471 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(Drug.class)
 			.getMetadataBuilder().build();