diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015, Julian K. Arni
+Copyright (c) 2015-2016, Servant Contributors
 
 All rights reserved.
 
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain
diff --git a/include/overlapping-compat.h b/include/overlapping-compat.h
new file mode 100644
--- /dev/null
+++ b/include/overlapping-compat.h
@@ -0,0 +1,8 @@
+#if __GLASGOW_HASKELL__ >= 710
+#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}
+#define OVERLAPPING_  {-# OVERLAPPING #-}
+#else
+{-# LANGUAGE OverlappingInstances #-}
+#define OVERLAPPABLE_
+#define OVERLAPPING_
+#endif
diff --git a/servant-blaze.cabal b/servant-blaze.cabal
--- a/servant-blaze.cabal
+++ b/servant-blaze.cabal
@@ -2,18 +2,18 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                servant-blaze
-version:             0.4.4.7
+version:             0.5
 synopsis:            Blaze-html support for servant
 -- description:
 homepage:            http://haskell-servant.github.io/
 license:             BSD3
 license-file:        LICENSE
-author:              Julian K. Arni
-maintainer:          jkarni@gmail.com
--- copyright:
+author:              Servant Contributors
+maintainer:          haskell-servant-maintainers@googlegroups.com
+copyright:           2015-2016 Servant Contributors
 category:            Web
 build-type:          Simple
--- extra-source-files:
+extra-source-files:  include/*.h
 cabal-version:       >=1.10
 bug-reports:         http://github.com/haskell-servant/servant/issues
 source-repository head
@@ -25,8 +25,9 @@
   -- other-modules:
   -- other-extensions:
   build-depends:       base >=4.7 && <5
-                     , servant == 0.4.*
+                     , servant == 0.5.*
                      , http-media
                      , blaze-html
   hs-source-dirs:      src
   default-language:    Haskell2010
+  include-dirs: include
diff --git a/src/Servant/HTML/Blaze.hs b/src/Servant/HTML/Blaze.hs
--- a/src/Servant/HTML/Blaze.hs
+++ b/src/Servant/HTML/Blaze.hs
@@ -3,10 +3,8 @@
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
-#if !MIN_VERSION_base(4,8,0)
-{-# LANGUAGE OverlappingInstances  #-}
-#endif
 
+#include "overlapping-compat.h"
 -- | An @HTML@ empty data type with `MimeRender` instances for @blaze-html@'s
 -- `ToMarkup` class and `Html` datatype.
 -- You should only need to import this module for it's instances and the
@@ -29,17 +27,9 @@
 instance Accept HTML where
     contentType _ = "text" M.// "html" M./: ("charset", "utf-8")
 
-instance
-#if MIN_VERSION_base(4,8,0)
-         {-# OVERLAPPABLE #-}
-#endif
-         ToMarkup a => MimeRender HTML a where
+instance OVERLAPPABLE_ ToMarkup a => MimeRender HTML a where
     mimeRender _ = renderHtml . toHtml
 
-instance
-#if MIN_VERSION_base(4,8,0)
-         {-# OVERLAPPING #-}
-#endif
-         MimeRender HTML Html where
+instance OVERLAPPING_ MimeRender HTML Html where
     mimeRender _ = renderHtml