diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index d9552c819..d6932ec73 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -197,6 +197,8 @@
     <Compile Include="Scheduling\Services\ScheduledTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
     <Compile Include="Scheduling\Models\Task.cs" />
+    <Compile Include="Settings\Models\SiteSettings2Part.cs" />
+    <Compile Include="Settings\Models\SiteSettings2PartRecord.cs" />
     <Compile Include="Settings\ResourceManifest.cs" />
     <Compile Include="Settings\Migrations.cs" />
     <Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />
diff --git a/src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs b/src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
index 102f2b03a..52707ff5e 100644
--- a/src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
+++ b/src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
@@ -6,9 +6,11 @@ using Orchard.ContentManagement.Handlers;
 namespace Orchard.Core.Settings.Handlers {
     [UsedImplicitly]
     public class SiteSettingsPartHandler : ContentHandler {
-        public SiteSettingsPartHandler(IRepository<SiteSettingsPartRecord> repository){
+        public SiteSettingsPartHandler(IRepository<SiteSettingsPartRecord> repository, IRepository<SiteSettings2PartRecord> repository2) {
             Filters.Add(new ActivatingFilter<SiteSettingsPart>("Site"));
+            Filters.Add(new ActivatingFilter<SiteSettings2Part>("Site"));
             Filters.Add(StorageFilter.For(repository));
+            Filters.Add(StorageFilter.For(repository2));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Migrations.cs b/src/Orchard.Web/Core/Settings/Migrations.cs
index 8af6255f5..bc0ca6290 100644
--- a/src/Orchard.Web/Core/Settings/Migrations.cs
+++ b/src/Orchard.Web/Core/Settings/Migrations.cs
@@ -97,9 +97,10 @@ namespace Orchard.Core.Settings {
         }
 
         public int UpdateFrom1() {
-            SchemaBuilder.AlterTable("SiteSettingsPartRecord",
+            SchemaBuilder.CreateTable("SiteSettings2PartRecord",
                 table => table
-                    .AddColumn<string>("BaseUrl", c => c.WithLength(255))
+                    .ContentPartRecord()
+                    .Column<string>("BaseUrl", c => c.Unlimited())
                 );
 
             return 2;
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettings2Part.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettings2Part.cs
new file mode 100644
index 000000000..6b7983964
--- /dev/null
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettings2Part.cs
@@ -0,0 +1,12 @@
+using Orchard.ContentManagement;
+using Orchard.Data.Conventions;
+
+namespace Orchard.Core.Settings.Models {
+    public sealed class SiteSettings2Part : ContentPart<SiteSettings2PartRecord> {
+        [StringLengthMax]
+        public string BaseUrl {
+            get { return Record.BaseUrl; }
+            set { Record.BaseUrl = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettings2PartRecord.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettings2PartRecord.cs
new file mode 100644
index 000000000..5458474f9
--- /dev/null
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettings2PartRecord.cs
@@ -0,0 +1,9 @@
+using Orchard.ContentManagement.Records;
+using Orchard.Data.Conventions;
+
+namespace Orchard.Core.Settings.Models {
+    public class SiteSettings2PartRecord : ContentPartRecord {
+        [StringLengthMax]
+        public virtual string BaseUrl { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
index 46beb3444..bf83d1f55 100644
--- a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Orchard.ContentManagement;
+using Orchard.Data.Conventions;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
@@ -44,10 +45,14 @@ namespace Orchard.Core.Settings.Models {
             set { Record.PageSize = value; }
         }
 
-        [StringLength(255)]
+        [StringLengthMax]
         public string BaseUrl {
-            get { return Record.BaseUrl; }
-            set { Record.BaseUrl = value; }
+            get {
+                return this.As<SiteSettings2Part>().BaseUrl;
+            }
+            set {
+                this.As<SiteSettings2Part>().BaseUrl = value;
+            }
         }
     }
 }
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
index 7eb2764e0..eb87877f5 100644
--- a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Orchard.ContentManagement.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
@@ -25,8 +24,5 @@ namespace Orchard.Core.Settings.Models {
         public virtual ResourceDebugMode ResourceDebugMode { get; set; }
 
         public virtual int PageSize { get; set; }
-
-        [StringLength(255)]
-        public virtual string BaseUrl { get; set; }
     }
 }
\ No newline at end of file