diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 51d98f5f..6970bfd0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.5.4 - October 25 2016
+* Update F# Compiler Service, Fantomas and FSharpLint
+
 #### 2.5.2 - October 17 2016
 * Fix class declaration coloring if it contains any static let bindings
 
diff --git a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs
index 03e0b860..1900b04e 100644
--- a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs
+++ b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs
@@ -7,16 +7,14 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("FSharp.Editing.VisualStudio.v2015")>]
 [<assembly: AssemblyProductAttribute("FSharpVSPowerTools")>]
 [<assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")>]
-[<assembly: AssemblyVersionAttribute("2.5.2")>]
-[<assembly: AssemblyFileVersionAttribute("2.5.2")>]
+[<assembly: AssemblyVersionAttribute("2.5.4")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.4")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests"
     let [<Literal>] AssemblyTitle = "FSharp.Editing.VisualStudio.v2015"
-    let [<Literal>] Version = "2.5.2"
-    let [<Literal>] InformationalVersion = "2.5.2"
     let [<Literal>] AssemblyProduct = "FSharpVSPowerTools"
     let [<Literal>] AssemblyDescription = "A collection of additional commands for F# in Visual Studio"
-    let [<Literal>] AssemblyVersion = "2.6.0"
-    let [<Literal>] AssemblyFileVersion = "2.6.0"
+    let [<Literal>] AssemblyVersion = "2.5.4"
+    let [<Literal>] AssemblyFileVersion = "2.5.4"
diff --git a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs
index 3542c5f2..dd94f7e5 100644
--- a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs
+++ b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs
@@ -7,16 +7,14 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("FSharp.Editing.VisualStudio")>]
 [<assembly: AssemblyProductAttribute("FSharpVSPowerTools")>]
 [<assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")>]
-[<assembly: AssemblyVersionAttribute("2.5.2")>]
-[<assembly: AssemblyFileVersionAttribute("2.5.2")>]
+[<assembly: AssemblyVersionAttribute("2.5.4")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.4")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.5.2"
-    let [<Literal>] InformationalVersion = "2.5.2"
     let [<Literal>] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests"
     let [<Literal>] AssemblyTitle = "FSharp.Editing.VisualStudio"
     let [<Literal>] AssemblyProduct = "FSharpVSPowerTools"
     let [<Literal>] AssemblyDescription = "A collection of additional commands for F# in Visual Studio"
-    let [<Literal>] AssemblyVersion = "2.6.0"
-    let [<Literal>] AssemblyFileVersion = "2.6.0"
+    let [<Literal>] AssemblyVersion = "2.5.4"
+    let [<Literal>] AssemblyFileVersion = "2.5.4"
diff --git a/src/FSharp.Editing/AssemblyInfo.fs b/src/FSharp.Editing/AssemblyInfo.fs
index c15a0842..079cf862 100644
--- a/src/FSharp.Editing/AssemblyInfo.fs
+++ b/src/FSharp.Editing/AssemblyInfo.fs
@@ -7,16 +7,14 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("FSharp.Editing")>]
 [<assembly: AssemblyProductAttribute("FSharpVSPowerTools")>]
 [<assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")>]
-[<assembly: AssemblyVersionAttribute("2.5.2")>]
-[<assembly: AssemblyFileVersionAttribute("2.5.2")>]
+[<assembly: AssemblyVersionAttribute("2.5.4")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.4")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.5.2"
-    let [<Literal>] InformationalVersion = "2.5.2"
     let [<Literal>] InternalsVisibleTo = "FSharp.Editing.Tests"
     let [<Literal>] AssemblyTitle = "FSharp.Editing"
     let [<Literal>] AssemblyProduct = "FSharpVSPowerTools"
     let [<Literal>] AssemblyDescription = "A collection of additional commands for F# in Visual Studio"
-    let [<Literal>] AssemblyVersion = "2.6.0"
-    let [<Literal>] AssemblyFileVersion = "2.6.0"
+    let [<Literal>] AssemblyVersion = "2.5.4"
+    let [<Literal>] AssemblyFileVersion = "2.5.4"
diff --git a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs
index 6bac5e01..8c0f8c97 100644
--- a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs
+++ b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs
@@ -6,17 +6,15 @@
 [assembly: AssemblyTitleAttribute("FSharpVSPowerTools")]
 [assembly: AssemblyProductAttribute("FSharpVSPowerTools")]
 [assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")]
-[assembly: AssemblyVersionAttribute("2.5.2")]
-[assembly: AssemblyFileVersionAttribute("2.5.2")]
+[assembly: AssemblyVersionAttribute("2.5.4")]
+[assembly: AssemblyFileVersionAttribute("2.5.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.5.2";
-        internal const string InformationalVersion = "2.5.2";
         internal const System.String InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests";
         internal const System.String AssemblyTitle = "FSharpVSPowerTools";
         internal const System.String AssemblyProduct = "FSharpVSPowerTools";
         internal const System.String AssemblyDescription = "A collection of additional commands for F# in Visual Studio";
-        internal const System.String AssemblyVersion = "2.6.0";
-        internal const System.String AssemblyFileVersion = "2.6.0";
+        internal const System.String AssemblyVersion = "2.5.4";
+        internal const System.String AssemblyFileVersion = "2.5.4";
     }
 }
diff --git a/src/FSharpVSPowerTools/source.extension.vsixmanifest b/src/FSharpVSPowerTools/source.extension.vsixmanifest
index d62f68c4..f79ee7bb 100644
--- a/src/FSharpVSPowerTools/source.extension.vsixmanifest
+++ b/src/FSharpVSPowerTools/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="FSharpVSPowerTools.68b42cfe-c752-4094-8dba-ed48aa81cac8" Version="2.5.2" Language="en-US" Publisher="fsharp.org" />
+    <Identity Id="FSharpVSPowerTools.68b42cfe-c752-4094-8dba-ed48aa81cac8" Version="2.5.4" Language="en-US" Publisher="fsharp.org" />
     <DisplayName>Visual F# Power Tools</DisplayName>
     <Description xml:space="preserve">A collection of additional commands for F# in Visual Studio</Description>
     <MoreInfo>https://github.com/fsprojects/VisualFSharpPowerTools</MoreInfo>