diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java
index bc006cd9cf0..d018aa69d58 100644
--- a/api/src/main/java/org/openmrs/Form.java
+++ b/api/src/main/java/org/openmrs/Form.java
@@ -16,28 +16,57 @@
 import java.util.List;
 import java.util.Set;
 
+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;
+
 /**
  * Form
  *
  * @version 1.0
  */
+@Entity
+@Table(name = "form")
 @Audited
 public class Form extends BaseChangeableOpenmrsMetadata {
 	
 	public static final long serialVersionUID = 845634L;
 	
 	// Fields
-	
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_form_id_seq")
+	@GenericGenerator(
+			name = "form_fomr_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value ="form_form_form_form_id_seq")
+	)
+	@Column(name = "form_id", nullable = false)
 	private Integer formId;
 	
+	@Column(name = "version", nullable = false, length = 50)
 	private String version;
 	
+	@Column(name = "build", nullable = true)
 	private Integer build;
 	
+	@Column(name = "published", nullable = true, length = 1)
 	private Boolean published = false;
 	
+	@ManyToOne
+	@JoinColumn(name = "encounter_type")
 	private EncounterType encounterType;
 	
+	@OneToMany(mappedBy = "form", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
 	private Set<FormField> formFields;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..68b1828d8e8 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -46,7 +46,6 @@
 		<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" />
-		<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" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
deleted file mode 100644
index 1e67c45288a..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
+++ /dev/null
@@ -1,83 +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="Form" table="form">
-
-		<id name="formId" type="int" column="form_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">form_form_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" 
-			column="name" not-null="true" length="255" />
-
-		<property name="version" type="java.lang.String" 
-			column="version" not-null="true" length="50" />
-		
-		<property name="build" type="java.lang.Integer" column="build" 
-			not-null="false" />
-		
-		<property name="published" type="boolean" column="published"
-			length="1" not-null="false" />
-
-		<property name="description" type="java.lang.String" 
-			column="description" length="1024" />
-
-		<many-to-one name="encounterType" class="EncounterType">
-			<column name="encounter_type" />
-		</many-to-one>
-
-		<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" not-null="true" length="19" />
-
-		<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" />
-
-		<set name="formFields" lazy="true" inverse="true" cascade="all-delete-orphan">
-			<key>
-				<column name="form_id" />
-			</key>
-			<one-to-many class="FormField" />
-		</set>
-
-		<property name="retired" type="boolean" 
-			column="retired" length="1" not-null="true"/>
-
-		<many-to-one name="retiredBy" class="User">
-			<column name="retired_by" />
-		</many-to-one>
-
-		<property name="dateRetired" type="java.util.Date"
-			column="date_retired" length="19" />
-
-		<property name="retireReason" type="java.lang.String" 
-			column="retired_reason" length="255" />
-
-	</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 6d553c03825..6b2dd5a439d 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.Form;
 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(Form.class)
 			.getMetadataBuilder().build();