diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright 2013-2014 Jan Bracker, Lennart Spitzner.
+Copyright 2013-2014 Jan Bracker
+Copyright 2013-2017 Lennart Spitzner
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for [`multistate` package](https://hackage.haskell.org/package/multistate)
 
+** 0.7.1.2 *August 2017*
+
+  * Adapt for ghc-8.2
+  
+  * Minor strictness fix for MultiRWS
+
 ## 0.7.1.1 *May 2016*
 
   * Adapt for ghc-8
diff --git a/multistate.cabal b/multistate.cabal
--- a/multistate.cabal
+++ b/multistate.cabal
@@ -1,11 +1,11 @@
 Name:          multistate
-Version:       0.7.1.1
+Version:       0.7.1.2
 Cabal-Version: >= 1.10
 Build-Type:    Simple
 license:       BSD3
 license-file:  LICENSE
-Copyright:     Jan Bracker, Lennart Spitzner
-Maintainer:    Lennart Spitzner <lsp@informatik.uni-kiel.de>
+Copyright:     Copyright (C) 2013-2017 Jan Bracker, 2013-2016 Lennart Spitzner
+Maintainer:    Lennart Spitzner <hexagoxel@hexagoxel.de>
 Author:        Jan Bracker, Lennart Spitzner
 Homepage:      https://github.com/lspitzner/multistate
 Bug-reports:   https://github.com/lspitzner/multistate/issues
@@ -31,9 +31,10 @@
     README.md
     changelog.md
 
-source-repository head
+source-repository head {
   type: git
   location: git@github.com:lspitzner/multistate.git
+}
 
 flag build-example
   description: Build the MultiState-example example program
@@ -65,7 +66,7 @@
     Control.Monad.Trans.MultiRWS.Strict
   other-modules:
   build-depends:
-    base         >= 4.6   && <4.10,
+    base         >= 4.6   && <4.11,
     mtl          >= 2.1   && <2.3,
     transformers >= 0.3   && <0.6,
     tagged       >= 0.7   && <0.9,
@@ -104,9 +105,9 @@
     -- no version constraints necessary, because they are already
     -- given by library
     multistate,
-    base <4.10,
+    base <4.11,
     transformers <0.6,
-    hspec <2.3
+    hspec >=2 && <2.5
   ghc-options:      -Wall
   main-is:          Test.hs
   hs-source-dirs:   test
@@ -121,7 +122,7 @@
       -- no version constraints necessary, because they are already
       -- given by library
       multistate,
-      base <4.10,
+      base <4.11,
       mtl <2.3,
       transformers <0.6
   } else {
diff --git a/src/Control/Monad/Trans/MultiRWS/Strict.hs b/src/Control/Monad/Trans/MultiRWS/Strict.hs
--- a/src/Control/Monad/Trans/MultiRWS/Strict.hs
+++ b/src/Control/Monad/Trans/MultiRWS/Strict.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE BangPatterns #-}
 
 -- | The multi-valued version of mtl's RWS / RWST
 module Control.Monad.Trans.MultiRWS.Strict
@@ -156,7 +157,8 @@
       => MonadMultiWriter a (MultiRWST r w s m) where
   mTell v = MultiRWST $ do
     (r,w,s) <- get
-    put $ (r, setHListElem (getHListElem w `mappend` v) w, s)
+    let !x' = getHListElem w `mappend` v
+    put $ (r, setHListElem x' w, s)
 
 #if MIN_VERSION_base(4,8,0)
 instance {-# OVERLAPPING #-} (Monad m, ContainsType a s)
@@ -164,7 +166,7 @@
 instance (Monad m, ContainsType a s)
 #endif
       => MonadMultiState a (MultiRWST r w s m) where
-  mSet v = MultiRWST $ do
+  mSet !v = MultiRWST $ do
     (r,w,s) <- get
     put (r, w, setHListElem v s)
   mGet = MultiRWST $ do