diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index db400ea733..49b4ec7baa 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -6,6 +6,7 @@
         </id> 
         <property name="Data" type="binary" />
         <component name="Metadata">
+            <property name="ID" column="MetadataID" type="String" length="36"/>
             <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" />
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
index b998653105..4ece29a4e1 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
 create table Assets (
-  ID NVARCHAR(255) not null,
+   ID NVARCHAR(36) not null,
+   MetadataID NVARCHAR(36) NOT NULL,  
    Type SMALLINT null,
    Name NVARCHAR(64) null,
    Description NVARCHAR(64) null,
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
index 95737815a4..1a392339b2 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
+  MetadataID VARCHAR(36) NOT NULL,
   Type TINYINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
index 47531237ac..f581b18b8b 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
+  MetadataID VARCHAR(36) NOT NULL,  
   Type SMALLINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
index 15e10b3988..b71b552a16 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
@@ -1,5 +1,6 @@
 CREATE TABLE Assets (
   ID VARCHAR(36) NOT NULL,
+  MetadataID VARCHAR(36) NOT NULL,  
   Type TINYINT DEFAULT NULL,
   Name VARCHAR(64) DEFAULT NULL,
   Description VARCHAR(64) DEFAULT NULL,