diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
index f3b7a73124..ede281c731 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
@@ -1,4 +1,4 @@
-CREATE TABLE `prims` (
+CREATE TABLE `Prims` (
   `ParentID` int(11) default NULL,
   `CreationDate` int(11) default NULL,
   `Name` varchar(255) default NULL,
@@ -48,4 +48,35 @@ CREATE TABLE `prims` (
   PRIMARY KEY  (`UUID`),
   KEY `prims_regionuuid` (`RegionID`),
   KEY 'prims_parentuuid' ('ParentUUID')
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PrimShapes` (
+  `Shape` int(11) default NULL,
+  `ScaleX` float default NULL,
+  `ScaleY` float default NULL,
+  `ScaleZ` float default NULL,
+  `PCode` int(11) default NULL,
+  `PathBegin` int(11) default NULL,
+  `PathEnd` int(11) default NULL,
+  `PathScaleX` int(11) default NULL,
+  `PathScaleY` int(11) default NULL,
+  `PathShearX` int(11) default NULL,
+  `PathShearY` int(11) default NULL,
+  `PathSkew` int(11) default NULL,
+  `PathCurve` int(11) default NULL,
+  `PathRadiusOffset` int(11) default NULL,
+  `PathRevolutions` int(11) default NULL,
+  `PathTaperX` int(11) default NULL,
+  `PathTaperY` int(11) default NULL,
+  `PathTwist` int(11) default NULL,
+  `PathTwistBegin` int(11) default NULL,
+  `ProfileBegin` int(11) default NULL,
+  `ProfileEnd` int(11) default NULL,
+  `ProfileCurve` int(11) default NULL,
+  `ProfileHollow` int(11) default NULL,
+  `State` int(11) default NULL,
+  `Texture` longblob,
+  `ExtraParams` longblob,
+  `UUID` char(36) NOT NULL default '',
+  PRIMARY KEY  (`UUID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;           
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index 8bd9589c1c..3a7d692d78 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Data.NHibernate.NHPrim, OpenSim.Data.NHibernate" table="Prims" lazy="false">
+    <class name="OpenSim.Region.Environment.Scene.SceneObjectPart, OpenSim.Region.Environment.Scene" table="Prims" lazy="false">
         <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>
-        <property name="ParentID" type="System.UInt32" />
+        <property name="ParentID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
         <property name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
         <property name="CreationDate" type="System.Int32" />
         <property name="Name" type="String" length="255" />
@@ -75,4 +75,10 @@
           <column name="SitTargetOrientW" />
         </property>
     </class>
+
+    <class name="OpenSim.Framework.PrimitiveBaseShape, OpenSim.Framework" table="PrimShapes" lazy="false">
+        <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+            <generator class="assigned" /> 
+        </id>
+    </class>
 </hibernate-mapping>
\ No newline at end of file