diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 6637e1a90e..70c7a46bf4 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -134,6 +134,8 @@ namespace OpenSim.Data
             {
                 int newversion = kvp.Key;
                 cmd.CommandText = kvp.Value;
+                // we need to up the command timeout to infinite as we might be doing long migrations.
+                cmd.CommandTimeout = 0;
                 cmd.ExecuteNonQuery();
                 
                 if (version == 0)