diff --git a/CHANGES b/CHANGES
new file mode 100644
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,29 @@
+* 0.5.0
+  - Change the implementation of the 'Monoid Maybe' instance such that it is
+    the same as the one for the lazy 'Maybe'; i.e., we now use
+
+      Nothing `mappend` m       = m
+      m       `mappend` Nothing = m
+      Just x1 `mappend` Just x2 = Just (x1 `mappend` x2)
+
+    instead of
+
+      Nothing `mappend` _       = Nothing
+      _       `mappend` Nothing = Nothing
+      Just x1 `mappend` Just x2 = Just (x1 `mappend` x2)
+
+* 0.4.0
+  - Add contributions by Oleg Grenrus (@phadej)
+    - Add 'Functor', 'Foldable', 'Traversable' for 'Pair'
+    - bifunctors-5.1 compatibility
+    - GHC 7.10.x -Wall cleaning
+    - Add 'Hashable' instances for 'Pair', 'Maybe', and 'Either'.
+
+* 0.3.0
+  - Add 'Foldable', and 'Traversable' instances (thanks @jaspervdj)
+
+* 0.2.3
+  - started changelog
+  - Make compatible with GHC 7.8 RC1
+
+
diff --git a/src/Data/Maybe/Strict.hs b/src/Data/Maybe/Strict.hs
--- a/src/Data/Maybe/Strict.hs
+++ b/src/Data/Maybe/Strict.hs
@@ -99,8 +99,8 @@
 instance Monoid a => Monoid (Maybe a) where
   mempty = Nothing
 
-  Nothing `mappend` _       = Nothing
-  _       `mappend` Nothing = Nothing
+  Nothing `mappend` m       = m
+  m       `mappend` Nothing = m
   Just x1 `mappend` Just x2 = Just (x1 `mappend` x2)
 
 -- foldable
diff --git a/strict-base-types.cabal b/strict-base-types.cabal
--- a/strict-base-types.cabal
+++ b/strict-base-types.cabal
@@ -1,5 +1,5 @@
 Name:           strict-base-types
-Version:        0.4.0
+Version:        0.5.0
 Synopsis:       Strict variants of the types provided in base.
 Category:       Data
 Description:
@@ -102,11 +102,15 @@
 Build-type:     Simple
 Tested-with:    GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.2
 
+extra-source-files:
+  CHANGES
+
 source-repository head
   type:     git
   location: https://github.com/meiersi/strict-base-types.git
 
 library
+  ghc-options:    -Wall -fwarn-incomplete-uni-patterns
   build-depends:
       base       >= 4.5 && < 5
     , lens       >= 3.9
@@ -123,5 +127,4 @@
       Data.Tuple.Strict
       Data.Maybe.Strict
       Data.Either.Strict
-  ghc-options:    -Wall -fwarn-incomplete-uni-patterns