diff --git a/src/Dbdeploy.Console/OptionsManager.cs b/src/Dbdeploy.Console/OptionsManager.cs
index e643f0b..5cb7ca0 100644
--- a/src/Dbdeploy.Console/OptionsManager.cs
+++ b/src/Dbdeploy.Console/OptionsManager.cs
@@ -87,7 +87,7 @@ private static OptionSet Initialize(DbDeployConfig config, ConfigFileInfo config
             options
                 .Add(
                     "d|dbms=",
-                    "DBMS type ('mssql', 'mysql' or 'ora')",
+                    "DBMS type ('mssql', 'mysql', 'ora' or 'db2')",
                     s => config.Dbms = s)
 
                 .Add(
diff --git a/src/Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManager.cs b/src/Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManager.cs
index 4b00608..aecb5b0 100755
--- a/src/Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManager.cs
+++ b/src/Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManager.cs
@@ -129,17 +129,25 @@ public virtual void RecordScriptStatus(ChangeScript script, ScriptStatus status,
                 var completeDateValue = status != ScriptStatus.Started ? this.syntax.CurrentTimestamp : "NULL";
                 if (script.ChangeId == 0)
                 {
+					var insertSql = string.Format(
+						CultureInfo.InvariantCulture,
+"INSERT INTO {0} (Folder, ScriptNumber, ScriptName, StartDate, CompleteDate, AppliedBy, ScriptStatus, ScriptOutput) VALUES (@1, @2, @3, {1}, {2}, {3}, @4, @5)",
+						this.changeLogTableName,
+						this.syntax.CurrentTimestamp,
+						completeDateValue,
+						this.syntax.CurrentUser);
+
+					// Execute insert.
+					this.queryExecuter.ExecuteQuery(insertSql, script.Folder, script.ScriptNumber, script.ScriptName, (int)status, output ?? string.Empty);
+
+
                     var sql = string.Format(
                         CultureInfo.InvariantCulture,
-@"INSERT INTO {0} (Folder, ScriptNumber, ScriptName, StartDate, CompleteDate, AppliedBy, ScriptStatus, ScriptOutput) VALUES (@1, @2, @3, {1}, {2}, {3}, @4, @5) 
-SELECT ChangeId FROM {0} WHERE Folder = @1 and ScriptNumber = @2",
-                        this.changeLogTableName,
-                        this.syntax.CurrentTimestamp,
-                        completeDateValue,
-                        this.syntax.CurrentUser);
+"SELECT ChangeId FROM {0} WHERE Folder = @1 and ScriptNumber = @2",
+                        this.changeLogTableName);
 
-                    // Execute insert and set change id so it can be updated.
-                    using (var reader = this.queryExecuter.ExecuteQuery(sql, script.Folder, script.ScriptNumber, script.ScriptName, (int)status, output ?? string.Empty))
+                    // Execute set change id so it can be updated.
+                    using (var reader = this.queryExecuter.ExecuteQuery(sql, script.Folder, script.ScriptNumber))
                     {
                         reader.Read();
                         script.ChangeId = reader.GetInt32(0);
diff --git a/src/Net.Sf.Dbdeploy/Database/Db2DbmsSyntax.cs b/src/Net.Sf.Dbdeploy/Database/Db2DbmsSyntax.cs
new file mode 100644
index 0000000..14a487a
--- /dev/null
+++ b/src/Net.Sf.Dbdeploy/Database/Db2DbmsSyntax.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Globalization;
+
+namespace Net.Sf.Dbdeploy.Database
+{
+	/// <summary>
+	/// IBM DB2 syntax.
+	/// </summary>
+	public class Db2DbmsSyntax : DbmsSyntax
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Db2DbmsSyntax" /> class.
+		/// </summary>
+		public Db2DbmsSyntax()
+			: base("db2")
+		{
+		}
+
+		/// <summary>
+		/// Gets the get timestamp.
+		/// </summary>
+		/// <value>
+		/// The get timestamp.
+		/// </value>
+		public override string CurrentTimestamp
+		{
+			get
+			{
+				return "CURRENT TIMESTAMP";
+			}
+		}
+
+		/// <summary>
+		/// Gets the syntax to get the current user.
+		/// </summary>
+		/// <value>
+		/// The current user syntax.
+		/// </value>
+		public override string CurrentUser
+		{
+			get
+			{
+				return "CURRENT USER";
+			}
+		}
+
+		/// <summary>
+		/// Gets the syntax for checking if a table exists.
+		/// </summary>
+		/// <param name="tableName">Name of the table.</param>
+		/// <returns>SQL for checking if a table exists.</returns>
+		public override string TableExists(string tableName)
+		{
+			// Use correct syntax for with and without schema.
+			string syntax;
+			var tableInfo = this.GetTableInfo(tableName);
+			if (!string.IsNullOrWhiteSpace(tableInfo.Schema))
+			{
+				syntax = string.Format(CultureInfo.InvariantCulture,
+@"SELECT TRIM(TABSCHEMA) || '.' || TRIM(TABNAME) 
+FROM SYSCAT.TABLES 
+WHERE TABSCHEMA='{0}' AND TABNAME='{1}'", tableInfo.Schema.ToUpper(), tableInfo.TableName.ToUpper());
+			}
+			else
+			{
+				syntax = string.Format(CultureInfo.InvariantCulture,
+@"SELECT TRIM(TABSCHEMA) || '.' || TRIM(TABNAME) 
+FROM SYSCAT.TABLES 
+WHERE TABNAME='{0}'", tableName.ToUpper());
+			}
+
+			return syntax;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Net.Sf.Dbdeploy/Database/DbmsFactory.cs b/src/Net.Sf.Dbdeploy/Database/DbmsFactory.cs
index 8d4e8fd..b003f8f 100755
--- a/src/Net.Sf.Dbdeploy/Database/DbmsFactory.cs
+++ b/src/Net.Sf.Dbdeploy/Database/DbmsFactory.cs
@@ -24,6 +24,8 @@ public virtual IDbmsSyntax CreateDbmsSyntax()
         {
             switch (this.dbms)
             {
+				case "db2":
+					return new Db2DbmsSyntax();
                 case "ora":
                     return new OracleDbmsSyntax();
                 case "mssql":
@@ -31,7 +33,7 @@ public virtual IDbmsSyntax CreateDbmsSyntax()
                 case "mysql":
                     return new MySqlDbmsSyntax();
                 default:
-                    throw new ArgumentException("Supported dbms: ora, mssql, mysql");
+                    throw new ArgumentException("Supported dbms: db2, ora, mssql, mysql");
             }
         }
 
diff --git a/src/Net.Sf.Dbdeploy/Net.Sf.Dbdeploy.csproj b/src/Net.Sf.Dbdeploy/Net.Sf.Dbdeploy.csproj
index cbdca51..4f359a2 100755
--- a/src/Net.Sf.Dbdeploy/Net.Sf.Dbdeploy.csproj
+++ b/src/Net.Sf.Dbdeploy/Net.Sf.Dbdeploy.csproj
@@ -124,6 +124,7 @@
     </Compile>
     <Compile Include="Appliers\DirectToDbApplier.cs" />
     <Compile Include="Database\TableInfo.cs" />
+    <Compile Include="Database\Db2DbmsSyntax.cs" />
     <Compile Include="UniqueChange.cs" />
     <Compile Include="DbDeployer.cs" />
     <Compile Include="Database\DelimiterTypeFactory.cs">
@@ -189,6 +190,12 @@
     <EmbeddedResource Include="Resources\SQLCMD.rll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\db2_undo.vm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\db2_apply.vm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\dbproviders.xml">
@@ -211,6 +218,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\CreateSchemaVersionTable.db2.sql">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Net.Sf.Dbdeploy/Resources/CreateSchemaVersionTable.db2.sql b/src/Net.Sf.Dbdeploy/Resources/CreateSchemaVersionTable.db2.sql
new file mode 100644
index 0000000..424a621
--- /dev/null
+++ b/src/Net.Sf.Dbdeploy/Resources/CreateSchemaVersionTable.db2.sql
@@ -0,0 +1,22 @@
+IF (NOT EXISTS (SELECT 1 FROM SYSCAT.SCHEMATA WHERE SCHEMANAME='$(SchemaName)')) THEN 
+	CREATE SCHEMA $(SchemaName) AUTHORIZATION DB2ADMIN
+END IF;
+
+CREATE TABLE $(QualifiedTableName) (
+	ChangeId INT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
+	Folder VARGRAPHIC(256) NOT NULL,
+	ScriptNumber SMALLINT NOT NULL,
+	ScriptName VARGRAPHIC(512) NOT NULL,
+	StartDate TIMESTAMP NOT NULL,
+	CompleteDate TIMESTAMP NULL,
+	AppliedBy VARGRAPHIC(128) NOT NULL,
+	ScriptStatus SMALLINT NOT NULL,
+	ScriptOutput DBCLOB(10485760) LOGGED NOT COMPACT NOT NULL,
+	CONSTRAINT PK_$(TableName) PRIMARY KEY (ChangeId)
+);
+
+CREATE UNIQUE INDEX IX_$(TableName) ON $(QualifiedTableName)
+(
+	Folder ASC,
+	ScriptNumber ASC
+);
\ No newline at end of file
diff --git a/src/Net.Sf.Dbdeploy/Resources/db2_apply.vm b/src/Net.Sf.Dbdeploy/Resources/db2_apply.vm
new file mode 100644
index 0000000..a5653f1
--- /dev/null
+++ b/src/Net.Sf.Dbdeploy/Resources/db2_apply.vm
@@ -0,0 +1,18 @@
+#foreach($script in $scripts)
+
+-- START CHANGE SCRIPT ${script}
+
+INSERT INTO ${changeLogTableName} (Folder, ScriptNumber, ScriptName, StartDate, AppliedBy, ScriptStatus, ScriptOutput)
+ VALUES ('${script.Folder}', ${script.ScriptNumber}, '${script.ScriptName}', CURRENT TIMESTAMP, CURRENT USER, 3, '')$!{separator}${delimiter}
+
+BEGIN TRANSACTION$!{separator}
+
+${script.getContent()}
+
+UPDATE ${changeLogTableName} 
+SET CompleteDate = getdate(), ScriptStatus = 1, ScriptOutput = '' 
+WHERE Folder = '$script.Folder' AND ScriptNumber = $script.ScriptNumber$!{separator}${delimiter}
+
+-- END CHANGE SCRIPT ${script}
+COMMIT TRANSACTION$!{separator}
+#end
\ No newline at end of file
diff --git a/src/Net.Sf.Dbdeploy/Resources/db2_undo.vm b/src/Net.Sf.Dbdeploy/Resources/db2_undo.vm
new file mode 100644
index 0000000..d1090ab
--- /dev/null
+++ b/src/Net.Sf.Dbdeploy/Resources/db2_undo.vm
@@ -0,0 +1,13 @@
+#foreach($script in $scripts)
+
+-- START UNDO OF CHANGE SCRIPT ${script}
+
+BEGIN TRANSACTION$!{separator}
+
+${script.getUndoContent()}
+
+DELETE FROM ${changeLogTableName} WHERE Folder = '$script.Folder' AND ScriptNumber = $script.ScriptNumber$!{separator}${delimiter}
+
+-- END UNDO OF CHANGE SCRIPT ${script}
+COMMIT TRANSACTION$!{separator}
+#end
\ No newline at end of file
diff --git a/src/SolutionVersionAssemblyInfo.cs b/src/SolutionVersionAssemblyInfo.cs
index 2ab94cd..86439d4 100644
--- a/src/SolutionVersionAssemblyInfo.cs
+++ b/src/SolutionVersionAssemblyInfo.cs
@@ -1 +1,3 @@
-// This file will be changed when building a package to contain the correct version
// Do not commit any changes here
using System.Reflection;

[assembly: AssemblyVersionAttribute("0.0.0.0")]
[assembly: AssemblyInformationalVersionAttribute("0.0.0.0-devel")]
[assembly: AssemblyFileVersionAttribute("0.0.0.0")]
+// This file will be changed when building a package to contain the correct version
// Do not commit any changes here
using System.Reflection;

[assembly: AssemblyVersionAttribute("2.2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.2.0.4-devel")]
+[assembly: AssemblyFileVersionAttribute("2.2.0.4")]
diff --git a/src/Test.Net.Sf.Dbdeploy/App.config b/src/Test.Net.Sf.Dbdeploy/App.config
index 34209f2..3991708 100755
--- a/src/Test.Net.Sf.Dbdeploy/App.config
+++ b/src/Test.Net.Sf.Dbdeploy/App.config
@@ -5,6 +5,7 @@
     <add key="ConnString-2ARMITAGE" value="Server=.;Initial Catalog=DBDEPLOY;Trusted_Connection=true" />
     <add key="MySqlConnString" value="Server=192.168.1.112;Initial Catalog=DBDEPLOY;User Id=root;Password=password" />
     <add key="OracleConnString" value="data source=ORACLE;user id=scott;password=tiger" />
+    <add key="Db2ConnString" value="Driver={IBM DB2 ODBC DRIVER};DataBase=DB1; HostName=192.168.72.135; Protocol=TCPIP;Port=50000;Uid=root;Pwd=password;CurrentSchema=DB01;DB2NETNamedParam=1;HostVarParameters=1" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
diff --git a/src/Test.Net.Sf.Dbdeploy/Database/AbstractDatabaseSchemaVersionManagerTest.cs b/src/Test.Net.Sf.Dbdeploy/Database/AbstractDatabaseSchemaVersionManagerTest.cs
index faccc8f..9c4711f 100755
--- a/src/Test.Net.Sf.Dbdeploy/Database/AbstractDatabaseSchemaVersionManagerTest.cs
+++ b/src/Test.Net.Sf.Dbdeploy/Database/AbstractDatabaseSchemaVersionManagerTest.cs
@@ -16,7 +16,7 @@ public abstract class AbstractDatabaseSchemaVersionManagerTest
 
         protected DatabaseSchemaVersionManager databaseSchemaVersion;
 
-        private IDbmsSyntax syntax;
+		protected IDbmsSyntax syntax;
 
         [SetUp]
         protected void SetUp()
diff --git a/src/Test.Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManagerTest.cs b/src/Test.Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManagerTest.cs
index e7a2662..af5c475 100644
--- a/src/Test.Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManagerTest.cs
+++ b/src/Test.Net.Sf.Dbdeploy/Database/DatabaseSchemaVersionManagerTest.cs
@@ -129,12 +129,15 @@ public void ShouldUpdateChangelogTable()
             this.syntax.Setup(s => s.CurrentTimestamp).Returns("TIMESTAMP");
 
             this.schemaVersionManager.RecordScriptStatus(this.script, ScriptStatus.Success, "Script output");
-            string expected = @"INSERT INTO ChangeLog (Folder, ScriptNumber, ScriptName, StartDate, CompleteDate, AppliedBy, ScriptStatus, ScriptOutput) VALUES (@1, @2, @3, TIMESTAMP, TIMESTAMP, DBUSER, @4, @5) 
-SELECT ChangeId FROM ChangeLog WHERE Folder = @1 and ScriptNumber = @2";
+			string insertSql = "INSERT INTO ChangeLog (Folder, ScriptNumber, ScriptName, StartDate, CompleteDate, AppliedBy, ScriptStatus, ScriptOutput) VALUES (@1, @2, @3, TIMESTAMP, TIMESTAMP, DBUSER, @4, @5)";
+			string expected = "SELECT ChangeId FROM ChangeLog WHERE Folder = @1 and ScriptNumber = @2";
 
-            Assert.AreEqual(expected, this.executedQueries.FirstOrDefault(), "The query executed was incorrect.");
+			Assert.AreEqual(2, this.executedQueries.Count, "The query executed was incorrect.");
+			Assert.AreEqual(insertSql, this.executedQueries[0], "The query executed was incorrect.");
+            Assert.AreEqual(expected, this.executedQueries[1], "The query executed was incorrect.");
 
-            this.queryExecuter.Verify(e => e.ExecuteQuery(expected, this.script.Folder, this.script.ScriptNumber, this.script.ScriptName, (int)ScriptStatus.Success, "Script output"), Times.Once());
+			this.queryExecuter.Verify(e => e.ExecuteQuery(insertSql, this.script.Folder, this.script.ScriptNumber, this.script.ScriptName, (int)ScriptStatus.Success, "Script output"), Times.Once());
+            this.queryExecuter.Verify(e => e.ExecuteQuery(expected, this.script.Folder, this.script.ScriptNumber), Times.Once());
         }
 
         [Test]
diff --git a/src/Test.Net.Sf.Dbdeploy/Database/Db2DatabaseSchemaVersionManagerTest.cs b/src/Test.Net.Sf.Dbdeploy/Database/Db2DatabaseSchemaVersionManagerTest.cs
new file mode 100644
index 0000000..a65214e
--- /dev/null
+++ b/src/Test.Net.Sf.Dbdeploy/Database/Db2DatabaseSchemaVersionManagerTest.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using System.Text;
+using Net.Sf.Dbdeploy.Appliers;
+using Net.Sf.Dbdeploy.Configuration;
+using Net.Sf.Dbdeploy.Scripts;
+using NUnit.Framework;
+
+namespace Net.Sf.Dbdeploy.Database
+{
+	[Category("DB2"), Category("DbIntegration")]
+	public class Db2DatabaseSchemaVersionManagerTest : AbstractDatabaseSchemaVersionManagerTest
+	{
+		private static string _connectionString;
+		private const string FOLDER = "Scripts";
+
+		private readonly string[] CHANGELOG_TABLE_DOES_NOT_EXIST_MESSAGES = new[] 
+		{
+			"No table found with name 'ChangeLog'.",
+		};
+		private const string DBMS = "db2";
+
+		protected override string ConnectionString
+		{
+			get
+			{
+				if (_connectionString == null)
+				{
+					_connectionString = ConfigurationManager.AppSettings["Db2ConnString-" + Environment.MachineName]
+										?? ConfigurationManager.AppSettings["Db2ConnString"];
+				}
+
+				return _connectionString;
+			}
+		}
+
+		protected override string Folder
+		{
+			get { return FOLDER; }
+		}
+
+		protected override string[] ChangelogTableDoesNotExistMessages
+		{
+			get { return CHANGELOG_TABLE_DOES_NOT_EXIST_MESSAGES; }
+		}
+
+		protected override string Dbms
+		{
+			get { return DBMS; }
+		}
+
+		protected override IDbConnection GetConnection()
+		{
+			return new Wintegra.Data.Db2Client.Db2Connection(ConnectionString);
+		}
+
+		protected override void InsertRowIntoTable(int i)
+		{
+			StringBuilder commandBuilder = new StringBuilder();
+			commandBuilder.AppendFormat("INSERT INTO {0}", TableName);
+			commandBuilder.Append("(ScriptNumber, Folder, StartDate, CompleteDate, AppliedBy, ScriptName, ScriptStatus, ScriptOutput)");
+			commandBuilder.AppendFormat(" VALUES ({0}, '{1}', CURRENT TIMESTAMP, CURRENT TIMESTAMP, CURRENT USER, 'Unit test', 1, '')", i, FOLDER);
+			ExecuteSql(commandBuilder.ToString());
+		}
+
+		/// <summary>
+		/// Ensures the table does not exist.
+		/// </summary>
+		/// <param name="tableName">Name of the table.</param>
+		protected override void EnsureTableDoesNotExist(string tableName)
+		{
+			var schema = this.ExecuteScalar<string>(this.syntax.TableExists(tableName));
+			if (string.IsNullOrEmpty(schema)) return;
+
+			var commandBuilder = new StringBuilder();
+			commandBuilder.AppendFormat("DROP TABLE {0}", schema);
+			ExecuteSql(commandBuilder.ToString());
+		}
+
+		[Test]
+		public void ShouldNotThrowExceptionIfAllPreviousScriptsAreCompleted()
+		{
+			this.EnsureTableDoesNotExist();
+			CreateTable();
+			InsertRowIntoTable(3);
+			var changeNumbers = new List<ChangeEntry>(databaseSchemaVersion.GetAppliedChanges());
+
+			Assert.AreEqual(1, changeNumbers.Count);
+			Assert.AreEqual("Scripts/3", changeNumbers[0].UniqueKey);
+		}
+
+		[Test]
+		public void TestDoesNotRunSecondScriptIfFirstScriptFails()
+		{
+			this.EnsureTableDoesNotExist("TableWeWillUse");
+			this.EnsureTableDoesNotExist(TableName);
+
+			var factory = new DbmsFactory(this.Dbms, this.ConnectionString);
+			var dbmsSyntax = factory.CreateDbmsSyntax();
+
+			var output = new StringBuilder();
+
+			var applier = new TemplateBasedApplier(
+				new StringWriter(output),
+				dbmsSyntax,
+				TableName,
+				";",
+				DbDeployDefaults.DelimiterType,
+				DbDeployDefaults.TemplateDirectory);
+
+			applier.Apply(new ChangeScript[]
+			{
+				new StubChangeScript(1, "1.test.sql", "INSERT INTO TableWeWillUse VALUES (1);"), 
+				new StubChangeScript(2, "2.test.sql", "CREATE TABLE TableWeWillUse (Id int NULL);"), 
+			}, createChangeLogTable: true);
+
+			var cmdOutput = new StringBuilder();
+
+			var executer = new QueryExecuter(factory);
+			executer.Execute(output.ToString(), cmdOutput);
+
+			this.AssertTableDoesNotExist("TableWeWillUse");
+		}
+
+		[Test]
+		public override void TestCanRetrieveSchemaVersionFromDatabase()
+		{
+			base.TestCanRetrieveSchemaVersionFromDatabase();
+		}
+
+		[Test]
+		public override void TestReturnsNoAppliedChangesWhenDatabaseTableDoesNotExist()
+		{
+			base.TestReturnsNoAppliedChangesWhenDatabaseTableDoesNotExist();
+		}
+
+		[Test]
+		public override void TestShouldReturnEmptySetWhenTableHasNoRows()
+		{
+			base.TestShouldReturnEmptySetWhenTableHasNoRows();
+		}
+
+		[Test]
+		public override void TestShouldCreateChangeLogTableWhenToldToDoSo()
+		{
+			base.TestShouldCreateChangeLogTableWhenToldToDoSo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Test.Net.Sf.Dbdeploy/Database/DbProvidersTest.cs b/src/Test.Net.Sf.Dbdeploy/Database/DbProvidersTest.cs
index d9d1ee4..b343c43 100755
--- a/src/Test.Net.Sf.Dbdeploy/Database/DbProvidersTest.cs
+++ b/src/Test.Net.Sf.Dbdeploy/Database/DbProvidersTest.cs
@@ -29,5 +29,11 @@ public void TestCanLoadMySQLProvider()
         {
             Assert.IsNotNull(providers.GetProvider("mysql"));
         }
+
+		[Test]
+		public void TestCanLoadDb2Provider()
+		{
+			Assert.IsNotNull(providers.GetProvider("db2"));
+		}
     }
 }
\ No newline at end of file
diff --git a/src/Test.Net.Sf.Dbdeploy/Database/ScriptGenerationTest.cs b/src/Test.Net.Sf.Dbdeploy/Database/ScriptGenerationTest.cs
index 4a49cf0..24df864 100644
--- a/src/Test.Net.Sf.Dbdeploy/Database/ScriptGenerationTest.cs
+++ b/src/Test.Net.Sf.Dbdeploy/Database/ScriptGenerationTest.cs
@@ -13,7 +13,7 @@ public class ScriptGenerationTest
         [Test]
         public void GenerateConsolidatedChangesScriptForAllDatabasesAndCompareAgainstTemplate()
         {
-            foreach (string syntax in new[] { "mssql", "mysql", "ora" }) 
+            foreach (string syntax in new[] { "mssql", "mysql", "ora", "db2" }) 
             {
                 try 
                 {
@@ -31,7 +31,7 @@ public void GenerateConsolidatedChangesScriptForAllDatabasesAndCompareAgainstTem
         [Test]
         public void GenerateConsolidatedChangesScriptForAllDatabasesLoadingTemplatesFromResourcesAndCompareAgainstTemplate()
         {
-            foreach (string syntax in new[] { "mssql", "mysql", "ora" }) 
+            foreach (string syntax in new[] { "mssql", "mysql", "ora", "db2" }) 
             {
                 try 
                 {
diff --git a/src/Test.Net.Sf.Dbdeploy/OutputFileEncodingTest.cs b/src/Test.Net.Sf.Dbdeploy/OutputFileEncodingTest.cs
index aefda4f..bf22437 100644
--- a/src/Test.Net.Sf.Dbdeploy/OutputFileEncodingTest.cs
+++ b/src/Test.Net.Sf.Dbdeploy/OutputFileEncodingTest.cs
@@ -38,7 +38,8 @@ public void WhenNotSpecifiedShouldReturnDefaultEncoding()
         public void WhenValidEncodingProvidedShouldCreateEncoding()
         {
             //TODO: since the default is locale specific, need to find a better way to test the first one
-            Assert.AreEqual(Encoding.Default.BodyName, new OutputFileEncoding("iso-8859-1").AsEncoding().BodyName);
+            //Assert.AreEqual(Encoding.Default.BodyName, new OutputFileEncoding("iso-8859-1").AsEncoding().BodyName);
+			Assert.AreEqual(Encoding.Default.BodyName, new OutputFileEncoding("koi8-r").AsEncoding().BodyName);
             Assert.AreEqual(Encoding.ASCII, new OutputFileEncoding("us-ascii").AsEncoding());
             Assert.AreEqual(Encoding.BigEndianUnicode, new OutputFileEncoding("unicodeFFFE").AsEncoding());
             Assert.AreEqual(Encoding.Unicode, new OutputFileEncoding("utf-16").AsEncoding());
diff --git a/src/Test.Net.Sf.Dbdeploy/Resources/Database/db2_expected.sql b/src/Test.Net.Sf.Dbdeploy/Resources/Database/db2_expected.sql
new file mode 100644
index 0000000..e309f27
--- /dev/null
+++ b/src/Test.Net.Sf.Dbdeploy/Resources/Database/db2_expected.sql
@@ -0,0 +1,32 @@
+
+-- START CHANGE SCRIPT v1.0/001_change.sql (1)
+
+INSERT INTO ChangeLog (Folder, ScriptNumber, ScriptName, StartDate, AppliedBy, ScriptStatus, ScriptOutput)
+ VALUES ('v1.0', 1, '001_change.sql', CURRENT TIMESTAMP, CURRENT USER, 3, '');
+
+BEGIN TRANSACTION
+
+-- contents of change script 1
+
+UPDATE ChangeLog 
+SET CompleteDate = getdate(), ScriptStatus = 1, ScriptOutput = '' 
+WHERE Folder = 'v1.0' AND ScriptNumber = 1;
+
+-- END CHANGE SCRIPT v1.0/001_change.sql (1)
+COMMIT TRANSACTION
+
+-- START CHANGE SCRIPT v1.0/002_change.sql (2)
+
+INSERT INTO ChangeLog (Folder, ScriptNumber, ScriptName, StartDate, AppliedBy, ScriptStatus, ScriptOutput)
+ VALUES ('v1.0', 2, '002_change.sql', CURRENT TIMESTAMP, CURRENT USER, 3, '');
+
+BEGIN TRANSACTION
+
+-- contents of change script 2
+
+UPDATE ChangeLog 
+SET CompleteDate = getdate(), ScriptStatus = 1, ScriptOutput = '' 
+WHERE Folder = 'v1.0' AND ScriptNumber = 2;
+
+-- END CHANGE SCRIPT v1.0/002_change.sql (2)
+COMMIT TRANSACTION
diff --git a/src/Test.Net.Sf.Dbdeploy/Test.Net.Sf.Dbdeploy.csproj b/src/Test.Net.Sf.Dbdeploy/Test.Net.Sf.Dbdeploy.csproj
index 21051fc..b07d507 100755
--- a/src/Test.Net.Sf.Dbdeploy/Test.Net.Sf.Dbdeploy.csproj
+++ b/src/Test.Net.Sf.Dbdeploy/Test.Net.Sf.Dbdeploy.csproj
@@ -103,6 +103,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Xml" />
+    <Reference Include="Wintegra.Data, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Wintegra.Data.1.1.2\lib\net20\Wintegra.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dbdeploy.Console\Dbdeploy.Console.csproj">
@@ -128,6 +132,7 @@
     <Compile Include="Appliers\DirectToDbApplierTest.cs" />
     <Compile Include="Console\OptionsManagerTest.cs" />
     <Compile Include="ControllerTest.cs" />
+    <Compile Include="Database\Db2DatabaseSchemaVersionManagerTest.cs" />
     <Compile Include="Database\MySqlDatabaseSchemaVersionManagerTest.cs" />
     <Compile Include="UniqueChangeTest.cs" />
     <Compile Include="Database\DatabaseSchemaVersionManagerTest.cs" />
@@ -214,6 +219,9 @@
     <Content Include="Mocks\Versioned\v2.0.10.0\3.SQLCMD Add Customer Data.sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\Database\db2_expected.sql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Resources\Database\ora_expected.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/src/Test.Net.Sf.Dbdeploy/packages.config b/src/Test.Net.Sf.Dbdeploy/packages.config
index 371b860..d432bdf 100644
--- a/src/Test.Net.Sf.Dbdeploy/packages.config
+++ b/src/Test.Net.Sf.Dbdeploy/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="Moq" version="4.1.1308.2321" targetFramework="net40" />
   <package id="MySql.Data" version="6.9.8" targetFramework="net40" />
+  <package id="Wintegra.Data" version="1.1.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/dbproviders.xml b/src/dbproviders.xml
index 6e68757..1db9df5 100755
--- a/src/dbproviders.xml
+++ b/src/dbproviders.xml
@@ -16,5 +16,11 @@
     description="MySQL, MySQL provider 1.0.7.30072"
     assemblyName="MySql.Data" 
     connectionClass="MySql.Data.MySqlClient.MySqlConnection"
+  />
+	<provider
+    name="db2"
+    description="Wintegra, Wrapper over IBM DB2 ODBC DRIVER over Microsoft ODBC provider V2.0.0.0 in framework .NET V2.0"
+    assemblyName="Wintegra.Data"
+    connectionClass="Wintegra.Data.Db2Client.Db2Connection"
   />
 </providers>