diff --git a/api/src/main/java/org/openmrs/FormField.java b/api/src/main/java/org/openmrs/FormField.java
index e1ebc9a6e8ea..b761747e3563 100755
--- a/api/src/main/java/org/openmrs/FormField.java
+++ b/api/src/main/java/org/openmrs/FormField.java
@@ -14,6 +14,17 @@
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.envers.Audited;
+import javax.persistence.CascadeType;
+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.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 
 /**
  * The FormField object relates/orders the <code>fields</code> on a <code>form</code> A form can
@@ -23,33 +34,55 @@
  * @see org.openmrs.Form
  * @see org.openmrs.Field
  */
+@Entity
+@Table(name = "form_field")
 @Audited
 public class FormField extends BaseChangeableOpenmrsMetadata implements java.io.Serializable, Comparable<FormField> {
 	
 	public static final long serialVersionUID = 3456L;
 	
 	// Fields
-	
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_field_id_seq")
+	@GenericGenerator(
+			name = "form_field_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "form_field_form_field_id_seq")
+		)
+	@Column(name = "form_field_id")
 	protected Integer formFieldId;
 	
+	@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE})
+	@JoinColumn(name = "parent_form_field")
 	protected FormField parent;
 	
+	@ManyToOne
+	@JoinColumn(name = "form_id", nullable = false)
 	protected Form form;
 	
+	@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE})
+	@JoinColumn(name = "field_id", nullable = false)
 	protected Field field;
 	
+	@Column(name = "field_number", length = 11)
 	protected Integer fieldNumber;
 	
+	@Column(name = "field_part", length = 5)
 	protected String fieldPart;
 	
+	@Column(name = "page_number", length = 11)
 	protected Integer pageNumber;
 	
+	@Column(name = "min_occurs", length = 11)
 	protected Integer minOccurs;
 	
+	@Column(name = "max_occurs", length = 11)
 	protected Integer maxOccurs;
 	
+	@Column(name = "required", nullable = false, length = 1)
 	protected Boolean required = false;
 	
+	@Column(name = "sort_weight", length = 5, nullable = true)
 	protected Float sortWeight;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..b4e211f53635 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -47,7 +47,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
 		<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" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
deleted file mode 100644
index 8cbbd9003b87..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
+++ /dev/null
@@ -1,79 +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="FormField" table="form_field">
-
-		<id name="formFieldId" type="int" column="form_field_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">form_field_form_field_id_seq</param>
-			</generator>
-		</id>
-
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-		<many-to-one name="parent" class="FormField" cascade="save-update,merge,evict">
-			<column name="parent_form_field" />
-		</many-to-one>
-
-		<many-to-one name="form" class="Form" not-null="true">
-			<column name="form_id" />
-		</many-to-one>
-
-		<many-to-one name="field" class="Field" not-null="true" cascade="save-update,merge,evict">
-			<column name="field_id" />
-		</many-to-one>
-
-		<property name="fieldNumber" type="int" 
-			column="field_number" length="11" />
-
-		<property name="fieldPart" type="java.lang.String" 
-			column="field_part" length="5" />
-
-		<property name="pageNumber" type="int" 
-			column="page_number" length="11" />
-
-		<property name="minOccurs" type="int" 
-			column="min_occurs" length="11" />
-
-		<property name="maxOccurs" type="int" 
-			column="max_occurs" length="11" />
-
-		<property name="required" type="boolean" 
-			column="required" length="1" not-null="true"/>
-
-		<property name="sortWeight" type="float"
-			column="sort_weight" length="5" not-null="false" />
-
-		<many-to-one name="creator" class="User" not-null="true">
-			<column name="creator" />
-		</many-to-one>
-
-		<property name="dateCreated" type="java.util.Date" 
-			column="date_created" length="19" not-null="true" />
-
-		<many-to-one name="changedBy" class="User">
-			<column name="changed_by" />
-		</many-to-one>
-
-		<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..3fe0600b2842 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -35,6 +35,7 @@
 import org.openmrs.DrugIngredient;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
+import org.openmrs.FormField;
 import org.openmrs.FreeTextDosingInstructions;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(FormField.class)
 			.getMetadataBuilder().build();