diff --git a/GHC/ForeignSrcLang/Type.hs b/GHC/ForeignSrcLang/Type.hs
--- a/GHC/ForeignSrcLang/Type.hs
+++ b/GHC/ForeignSrcLang/Type.hs
@@ -6,5 +6,5 @@
 import GHC.Generics (Generic)
 
 data ForeignSrcLang
-  = LangC | LangCxx | LangObjc | LangObjcxx
+  = LangC | LangCxx | LangObjc | LangObjcxx | RawObject
   deriving (Eq, Show, Generic)
diff --git a/GHC/LanguageExtensions/Type.hs b/GHC/LanguageExtensions/Type.hs
--- a/GHC/LanguageExtensions/Type.hs
+++ b/GHC/LanguageExtensions/Type.hs
@@ -63,6 +63,7 @@
    | GADTSyntax
    | NPlusKPatterns
    | DoAndIfThenElse
+   | BlockArguments
    | RebindableSyntax
    | ConstraintKinds
    | PolyKinds                -- Kind polymorphism
@@ -81,6 +82,7 @@
    | DeriveAnyClass           -- Allow deriving any class
    | DeriveLift               -- Allow deriving Lift
    | DerivingStrategies
+   | DerivingVia              -- Derive through equal representation
 
    | TypeSynonymInstances
    | FlexibleContexts
@@ -133,4 +135,7 @@
    | StrictData
    | MonadFailDesugaring
    | EmptyDataDeriving
+   | NumericUnderscores
+   | QuantifiedConstraints
+   | StarIsType
    deriving (Eq, Enum, Show, Generic)
diff --git a/changelog.md b/changelog.md
deleted file mode 100644
--- a/changelog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 8.0.1  *May 2016*
-
-  * Bundled with GHC 8.0.1
-
-  * Initial version
diff --git a/ghc-boot-th.cabal b/ghc-boot-th.cabal
--- a/ghc-boot-th.cabal
+++ b/ghc-boot-th.cabal
@@ -1,5 +1,5 @@
 name:           ghc-boot-th
-version:        8.4.4
+version:        8.6.1
 license:        BSD3
 license-file:   LICENSE
 category:       GHC
@@ -15,7 +15,6 @@
                 be depended upon by user code.
 cabal-version:  >=1.10
 build-type:     Simple
-extra-source-files: changelog.md
 
 source-repository head
     type:     git
@@ -31,4 +30,4 @@
             GHC.ForeignSrcLang.Type
             GHC.Lexeme
 
-    build-depends: base       >= 4.7 && < 4.12
+    build-depends: base       >= 4.7 && < 4.13