diff --git a/api/src/main/java/org/openmrs/GlobalProperty.java b/api/src/main/java/org/openmrs/GlobalProperty.java
index ce7b503b2eae..9cac22aa9a39 100644
--- a/api/src/main/java/org/openmrs/GlobalProperty.java
+++ b/api/src/main/java/org/openmrs/GlobalProperty.java
@@ -12,48 +12,83 @@
 import java.util.Date;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.envers.Audited;
 import org.openmrs.customdatatype.CustomDatatype;
 import org.openmrs.customdatatype.CustomDatatypeUtil;
 import org.openmrs.customdatatype.CustomValueDescriptor;
 import org.openmrs.customdatatype.SingleCustomValue;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
 /**
  * Global properties are simple key-value pairs persisted in the database GPs can be thought of as
  * something similar to environment variables used in operating systems.
  */
+@Entity
+@Table(name = "global_property")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 @Audited
 public class GlobalProperty extends BaseOpenmrsObject implements CustomValueDescriptor, SingleCustomValue<GlobalProperty> {
 	
 	private static final long serialVersionUID = 1L;
 	
+	@Id
+	@Column(name = "property", nullable = false, length = 255)
 	private String property = "";
 	
+	@Column(name = "property_value", columnDefinition = "TEXT")
+	@Lob
 	private String propertyValue = "";
 	
 	private transient Object typedValue;
 	
 	// if true, indicates that setValue has been called, and we need to invoke CustomDatatype's save
+	@Transient
 	private boolean dirty = false;
 	
+	@Column(name = "description", length = 1024)
 	private String description = "";
 	
+	@Column(name = "datatype", length = 255)
 	private String datatypeClassname;
 	
+	@Column(name = "datatype_config", columnDefinition = "TEXT")
+	@Lob
 	private String datatypeConfig;
 	
+	@Column(name = "preferred_handler", length = 255)
 	private String preferredHandlerClassname;
 	
+	@Column(name = "handler_config", columnDefinition = "TEXT")
+	@Lob
 	private String handlerConfig;
 	
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
 	
+	@Column(name = "date_changed")
 	private Date dateChanged;
 	
+	@ManyToOne
+	@JoinColumn(name = "view_privilege")
 	private Privilege viewPrivilege;
 	
+	@ManyToOne
+	@JoinColumn(name = "edit_privilege")
 	private Privilege editPrivilege;
 	
+	@ManyToOne
+	@JoinColumn(name = "delete_privilege")
 	private Privilege deletePrivilege;
 	
 	
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..b2c803b31b7e 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -49,7 +49,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
         <mapping resource="org/openmrs/api/db/hibernate/FormResource.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Obs.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Person.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml
deleted file mode 100644
index e67ea95d39e6..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml
+++ /dev/null
@@ -1,54 +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="GlobalProperty" table="global_property">
-
-        <cache usage="read-write"/>
-
-		<id name="property" type="java.lang.String" column="property" length="255">
-			<generator class="assigned" />
-		</id>
-
-		<property name="propertyValue" type="text" column="property_value"
-			not-null="false" length="65535"/>
-		
-		<property name="description" type="text" not-null="false" length="65535"/>
-
-        <property name="datatypeClassname" type="java.lang.String" column="datatype" length="255" />
-        
-        <property name="datatypeConfig" type="text" column="datatype_config" length="65535" />
-        
-        <property name="preferredHandlerClassname" type="java.lang.String" column="preferred_handler" length="255" />
-        
-        <property name="handlerConfig" type="text" column="handler_config" length="65535" />
-
-		<many-to-one name="editPrivilege" column="edit_privilege" class="org.openmrs.Privilege" not-null="false" />
-		
-		<many-to-one name="viewPrivilege" column="view_privilege" class="org.openmrs.Privilege" not-null="false" />
-		
-		<many-to-one name="deletePrivilege" column="delete_privilege" class="org.openmrs.Privilege" not-null="false" />
-
-		<property name="uuid" type="java.lang.String" 
-			column="uuid" length="38" unique="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 6d553c038256..07bb88a592c3 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2739,6 +2739,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(PatientIdentifierType.class)
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
+			.addAnnotatedClass(GlobalProperty.class)
 			.addAnnotatedClass(OrderType.class)
 			.getMetadataBuilder().build();