diff --git a/api/src/main/java/org/openmrs/PatientIdentifier.java b/api/src/main/java/org/openmrs/PatientIdentifier.java
index 516f7bf09bc5..24ba1682b33d 100644
--- a/api/src/main/java/org/openmrs/PatientIdentifier.java
+++ b/api/src/main/java/org/openmrs/PatientIdentifier.java
@@ -28,6 +28,16 @@
 import org.openmrs.util.OpenmrsUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.GenericGenerator;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 /**
  * A <code>Patient</code> can have zero to n identifying PatientIdentifier(s). PatientIdentifiers
@@ -37,6 +47,8 @@
  *
  * @see org.openmrs.PatientIdentifierType
  */
+@Entity
+@Table(name = "patient_identifier")
 @Indexed
 @Audited
 public class PatientIdentifier extends BaseChangeableOpenmrsData implements java.io.Serializable, Cloneable, Comparable<PatientIdentifier> {
@@ -51,9 +63,19 @@ public class PatientIdentifier extends BaseChangeableOpenmrsData implements java
 	 * @since 1.5
 	 */
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "patient_identifier_id_seq")
+	@GenericGenerator(
+			name = "patient_identifier_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "patient_identifier_patient_identifier_id_seq")
+		)
+	@Column(name = "patient_identifier_id")
 	private Integer patientIdentifierId;
-
+	
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
+	@ManyToOne
+	@JoinColumn(name = "patient_id")
 	private Patient patient;
 
 	@Fields({
@@ -63,17 +85,24 @@ public class PatientIdentifier extends BaseChangeableOpenmrsData implements java
 			@Field(name = "identifierAnywhere", analyzer = @Analyzer(definition = LuceneAnalyzers.ANYWHERE_ANALYZER))
 	})
 	@SortableField(forField = "identifierExact")
+	@Column(name = "identifier", length = 50)
 	private String identifier;
 
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
+	@ManyToOne
+	@JoinColumn(name = "identifier_type")
 	private PatientIdentifierType identifierType;
 	
+	@ManyToOne
+	@JoinColumn(name = "location_id", nullable = true)
 	private Location location;
 
+	@ManyToOne
+	@JoinColumn(name = "patient_program_id", nullable = true)
 	private PatientProgram patientProgram;
 	
-
 	@Field
+	@Column(name = "preferred", nullable = false)
 	private Boolean preferred = false;
 	
 	/** default constructor */
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..02d3953351fd 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -59,7 +59,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Privilege.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Role.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Patient.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml" />
                 <mapping resource="org/openmrs/api/db/hibernate/PatientProgram.hbm.xml" />
                 <mapping resource="org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/RelationshipType.hbm.xml" />
@@ -113,4 +112,4 @@
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
   </session-factory>
 
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml
deleted file mode 100644
index 18a92025b9a8..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml
+++ /dev/null
@@ -1,44 +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="org.openmrs.PatientIdentifier" table="patient_identifier">
-	
-		<id name="patientIdentifierId" type="int" column="patient_identifier_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">patient_identifier_patient_identifier_id_seq</param>
-			</generator>
-		</id>
-
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
-		<many-to-one name="patient" column="patient_id" class="org.openmrs.Patient"/>
-		<property name="identifier" type="java.lang.String" length="50"/>
-		<many-to-one name="identifierType" class="org.openmrs.PatientIdentifierType" column="identifier_type"/>
-
-		<many-to-one name="location" class="org.openmrs.Location" column="location_id" not-null="false"/>
-		<many-to-one name="patientProgram" class="org.openmrs.PatientProgram" column="patient_program_id" not-null="false"/>
-		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" />
-		<property name="dateVoided" type="java.util.Date" column="date_voided"/>
-		<property name="preferred" type="boolean" not-null="true" />
-		<property name="voided" type="boolean" not-null="true" />
-		<property name="voidReason" type="java.lang.String" column="void_reason" length="255"/>
-		<many-to-one name="creator" class="org.openmrs.User" column="creator" not-null="true"/>
-		<many-to-one name="voidedBy" class="org.openmrs.User" column="voided_by" />
-		<many-to-one name="changedBy" class="org.openmrs.User" column="changed_by" />
-		<property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
-	</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..0ee70f2788aa 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -52,6 +52,7 @@
 import org.openmrs.OrderSet;
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
+import org.openmrs.PatientIdentifier;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.PatientState;
 import org.openmrs.PersonAddress;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(PatientIdentifier.class)
 			.getMetadataBuilder().build();