diff --git a/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java b/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
index 664379ecb89..482e34bb3df 100644
--- a/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
+++ b/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
@@ -38,7 +38,7 @@ public abstract class BaseOpenmrsMetadata extends BaseOpenmrsObject implements O
 	@Field
 	private String name;
 	
-	@Column(name = "description", length = 255)
+	@Column(name = "description", columnDefinition = "clob")
 	private String description;
 	
 	@ManyToOne(optional = false)
diff --git a/api/src/main/java/org/openmrs/PatientIdentifierType.java b/api/src/main/java/org/openmrs/PatientIdentifierType.java
index 600530bba2b..f54e26e12aa 100644
--- a/api/src/main/java/org/openmrs/PatientIdentifierType.java
+++ b/api/src/main/java/org/openmrs/PatientIdentifierType.java
@@ -10,14 +10,30 @@
 package org.openmrs;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 /**
  * PatientIdentifierType
  */
+@Entity
+@Table(name = "patient_identifier_type")
 @Audited
+@AttributeOverrides({
+	@AttributeOverride(name = "name", column = @Column(name = "name", nullable = false, length = 50))
+})
 public class PatientIdentifierType extends BaseChangeableOpenmrsMetadata {
 	
 	public static final long serialVersionUID = 211231L;
@@ -61,19 +77,31 @@ public enum UniquenessBehavior {
 	
 	// Fields
 	@DocumentId
+	@Id
+	@GeneratedValue(generator = "native")
+	@GenericGenerator(name = "native", strategy = "native")
+	@Column(name = "patient_identifier_type_id")
 	private Integer patientIdentifierTypeId;
-	
+
+	@Column(name = "format")
 	private String format;
 
 	@Field
+	@Column(name = "required", nullable = false)
 	private Boolean required = Boolean.FALSE;
-	
+
+	@Column(name = "format_description", length = 250)
 	private String formatDescription;
 
+	@Column(name = "validator", length = 200)
 	private String validator;
-	
+
+	@Enumerated(EnumType.STRING)
+	@Column(name = "location_behavior", length = 50)
 	private LocationBehavior locationBehavior;
-	
+
+	@Enumerated(EnumType.STRING)
+	@Column(name = "uniqueness_behavior", length = 50)
 	private UniquenessBehavior uniquenessBehavior;
 	
 	/** default constructor */
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 85402c4b68d..60ccdf2099b 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -60,7 +60,6 @@
 		<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/PatientIdentifierType.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" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml
deleted file mode 100644
index 611cc5ab307..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml
+++ /dev/null
@@ -1,99 +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="PatientIdentifierType" table="patient_identifier_type">
-
-	<id name="patientIdentifierTypeId" type="java.lang.Integer" column="patient_identifier_type_id"
-        unsaved-value="0">
-		<generator class="native">
-			<param name="sequence">patient_identifier_type_patient_identifier_type_id_seq</param>
-		</generator>
-    </id>
-
-    
-
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-    <property
-        name="name"
-        type="java.lang.String"
-        not-null="true"
-        length="50"
-    />
-    <property
-        name="description"
-        type="java.lang.String"
-        length="65535"
-    />
-    <property
-        name="format"
-        type="java.lang.String"
-        length="255"
-    />
-
-    <property
-        name="formatDescription"
-        type="java.lang.String"
-        column="format_description"
-        length="250"
-    />
-    
-    <property name="required" type="boolean" not-null="true"/>
-    
-    <property name="validator" type="java.lang.String" column="validator" length="200"/>
-    
-    <property
-        name="dateCreated"
-        type="java.util.Date"
-        column="date_created"
-        not-null="true"
-        length="19"
-    />
-    
-	<property name="locationBehavior" column="location_behavior" length="50">
-		<type name="org.hibernate.type.EnumType">
-			<param name="enumClass">org.openmrs.PatientIdentifierType$LocationBehavior</param>
-			<param name="useNamed">true</param>
-		</type>
-	</property>
-    
-    <property name="uniquenessBehavior" column="uniqueness_behavior" length="50">
-    	<type name="org.hibernate.type.EnumType">
-    		<param name="enumClass">org.openmrs.PatientIdentifierType$UniquenessBehavior</param>
-    		<param name="useNamed">true</param>
-    	</type>
-    </property>
-	
-    <!-- Associations -->
-  
-    <many-to-one name="creator" class="User" 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" />
-	<property name="retired" type="boolean" column="retired"
-			length="1" not-null="true" />
-
-	<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 207b7c2cbed..e47ce608ad4 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.PatientIdentifierType;
 import org.openmrs.PatientState;
 import org.openmrs.PersonAddress;
 import org.openmrs.PersonAttributeType;
@@ -2733,6 +2734,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(PatientState.class)
 			.addAnnotatedClass(DrugIngredient.class)
 			.addAnnotatedClass(AlertRecipient.class)
+			.addAnnotatedClass(PatientIdentifierType.class)
 			.getMetadataBuilder().build();