diff --git a/Changelog.md b/Changelog.md
new file mode 100644
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,9 @@
+# Changelog for [`frisby` package](http://github.com/bgamari/frisby)
+
+## 0.2.2
+
+* Compatibility with Semigroup/Monoid proposal
+
+## Prehistory
+
+There is only darkness.
diff --git a/Text/Parsers/Frisby.hs b/Text/Parsers/Frisby.hs
--- a/Text/Parsers/Frisby.hs
+++ b/Text/Parsers/Frisby.hs
@@ -187,6 +187,7 @@
 import qualified Data.Semigroup as Semigroup
 import Data.Monoid hiding(Any,(<>))
 import qualified Data.Map as Map
+import Prelude hiding((<>))
 
 --inline usable part of Unsafe.Coerce until that module is commonly available
 import GHC.Base (unsafeCoerce#)
diff --git a/frisby.cabal b/frisby.cabal
--- a/frisby.cabal
+++ b/frisby.cabal
@@ -1,5 +1,5 @@
 name:                frisby
-version:             0.2.1
+version:             0.2.2
 cabal-version:       >=1.6
 license:             BSD3
 copyright:           John Meacham (2006)
@@ -22,6 +22,7 @@
                      .
                      In addition to many standard combinators, frisby provides
                      routines to translate standard regex syntax into frisby parsers.
+extra-source-files:  Changelog.md
 category:            Text
 tested-with:         GHC == 7.6.*, GHC == 7.8.*, GHC == 7.10.*, GHC == 8.0.*, GHC == 8.2.*
 license-file:        LICENSE