diff --git a/BREAKING-CHANGES.md b/BREAKING-CHANGES.md
index 37bfa515..6363bbbe 100644
--- a/BREAKING-CHANGES.md
+++ b/BREAKING-CHANGES.md
@@ -1,5 +1,20 @@
 # Breaking Changes
 
+## 3.0.0
+
+### Assertions
+
+Assertions have been moved from `NSpec` namespace to `NSpec.Assertions`.
+
+#### Reason
+
+When client test code is also using Shouldly, NSpec assertions go in conflict
+with those from `Shouldly` namespace.
+
+#### Workaround
+
+Everywhere NSpec assertions are used, add a `using NSpec.Assertions;` directive.
+
 ## 2.0.0
 
 ### .NET Framework 4.5
diff --git a/sln/SharedAssemblyInfo.cs b/sln/SharedAssemblyInfo.cs
index f551f210..cf5b16a4 100644
--- a/sln/SharedAssemblyInfo.cs
+++ b/sln/SharedAssemblyInfo.cs
@@ -21,6 +21,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("3.0.0")]
 
 // AssemblyFileVersion not explicitly specified, so it will be same as AssemblyVersion
diff --git a/sln/src/NSpec/NSpec.nuspec b/sln/src/NSpec/NSpec.nuspec
index 6913843a..03645593 100644
--- a/sln/src/NSpec/NSpec.nuspec
+++ b/sln/src/NSpec/NSpec.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>NSpec</id>
-    <version>2.0.1.0</version>
+    <version>3.0.0.0</version>
     <title>NSpec</title>
     <summary>NSpec is a testing framework for .NET. NSpec is heavily inspired by RSpec and Mocha.</summary>
     <description>NSpec is a BDD-style testing framework for .NET. NSpec is intended to drive development by specifying behavior within a context or scenario. NSpec belongs to the xSpec (Context/Specification) family and is heavily inspired by RSpec and Mocha.</description>
diff --git a/sln/src/NSpec/project.json b/sln/src/NSpec/project.json
index 0aafc53e..dff534fb 100644
--- a/sln/src/NSpec/project.json
+++ b/sln/src/NSpec/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1.0",
+  "version": "3.0.0.0",
 
   "buildOptions": {
     "compile": {
diff --git a/sln/test/Samples/DotNetTestSample/test/LibrarySpecs/project.json b/sln/test/Samples/DotNetTestSample/test/LibrarySpecs/project.json
index 071715ba..2e0a4221 100644
--- a/sln/test/Samples/DotNetTestSample/test/LibrarySpecs/project.json
+++ b/sln/test/Samples/DotNetTestSample/test/LibrarySpecs/project.json
@@ -4,11 +4,11 @@
   "testRunner": "nspec",
 
   "dependencies": {
-    "dotnet-test-nspec": "0.1.1-dev-71",
+    "dotnet-test-nspec": "0.2.0",
     "LibraryUnderTest": {
       "target": "project"
     },
-    "NSpec": "2.0.1-dev-71",
+    "NSpec": "3.0.0",
     "Shouldly": "2.8.2"
   },
 
diff --git a/sln/test/Samples/NetFrameworkSample/test/LibrarySpecs/packages.config b/sln/test/Samples/NetFrameworkSample/test/LibrarySpecs/packages.config
index a97dcf8f..30840a75 100644
--- a/sln/test/Samples/NetFrameworkSample/test/LibrarySpecs/packages.config
+++ b/sln/test/Samples/NetFrameworkSample/test/LibrarySpecs/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NSpec" version="2.0.1" targetFramework="net451" />
+  <package id="NSpec" version="3.0.0" targetFramework="net451" />
   <package id="Shouldly" version="2.8.2" targetFramework="net451" />
 </packages>
\ No newline at end of file