diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index 7c42609eeb..db400ea733 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -4,11 +4,13 @@
         <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
-        <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-        <property name="Name" type="String" length="64" />
-        <property name="Description" type="String" length="64" />
-        <property name="Local" type="boolean" />
-        <property name="Temporary" type="boolean" />
         <property name="Data" type="binary" />
+        <component name="Metadata">
+            <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
+            <property name="Name" type="String" length="64" />
+            <property name="Description" type="String" length="64" />
+            <property name="Local" type="boolean" />
+            <property name="Temporary" type="boolean" />
+        </component>
     </class>
 </hibernate-mapping>
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index f9c94574f4..88ac4a630c 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -61,6 +61,15 @@ namespace OpenSim.Framework
             get { return _metadata; }
             set { _metadata = value; }
         }
+
+        // We expose FullID here because the NHibernate mappers require a
+        // property on the AssetBase class for its primary key (see
+        // OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml).
+        public UUID FullID
+        {
+            get { return Metadata.FullID; }
+            set { Metadata.FullID = value; }
+        }
     }
 
     [Serializable]