diff --git a/LICENSE b/LICENSE
index 58b0299..311379c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,26 @@
-The MIT License (MIT)
+Copyright 2018 PureScript
 
-Copyright (c) 2014 PureScript
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/bower.json b/bower.json
index 6b291c9..e7cb87e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,8 +1,7 @@
 {
   "name": "purescript-maybe",
   "homepage": "https://github.com/purescript/purescript-maybe",
-  "description": "Optional values",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript/purescript-maybe.git"
@@ -17,7 +16,9 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-monoid": "^3.0.0",
-    "purescript-prelude": "^3.0.0"
+    "purescript-prelude": "^4.0.0",
+    "purescript-control": "^4.0.0",
+    "purescript-invariant": "^4.0.0",
+    "purescript-newtype": "^3.0.0"
   }
 }
diff --git a/package.json b/package.json
index f9e9db6..01da16a 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
     "build": "pulp build -- --censor-lib --strict"
   },
   "devDependencies": {
-    "pulp": "^10.0.4",
-    "purescript-psa": "^0.5.0-rc.1",
-    "rimraf": "^2.6.1"
+    "pulp": "^12.2.0",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }
diff --git a/src/Data/Maybe.purs b/src/Data/Maybe.purs
index a02b0dd..0a6c490 100644
--- a/src/Data/Maybe.purs
+++ b/src/Data/Maybe.purs
@@ -10,7 +10,6 @@ import Control.Plus (class Plus)
 
 import Data.Eq (class Eq1)
 import Data.Functor.Invariant (class Invariant, imapF)
-import Data.Monoid (class Monoid)
 import Data.Ord (class Ord1)
 
 -- | The `Maybe` type is used to represent optional values and can be seen as
@@ -242,7 +241,7 @@ maybe' _ f (Just a) = f a
 -- | fromMaybe x (Just y) == y
 -- | ```
 fromMaybe :: forall a. a -> Maybe a -> a
-fromMaybe a = maybe a id
+fromMaybe a = maybe a identity
 
 -- | Similar to `fromMaybe` but for use in cases where the default value may be
 -- | expensive to compute. As PureScript is not lazy, the standard `fromMaybe`
@@ -254,7 +253,7 @@ fromMaybe a = maybe a id
 -- | fromMaybe' (\_ -> x) (Just y) == y
 -- | ```
 fromMaybe' :: forall a. (Unit -> a) -> Maybe a -> a
-fromMaybe' a = maybe' a id
+fromMaybe' a = maybe' a identity
 
 -- | Returns `true` when the `Maybe` value was constructed with `Just`.
 isJust :: forall a. Maybe a -> Boolean
diff --git a/src/Data/Maybe/First.purs b/src/Data/Maybe/First.purs
index 2b46478..4ab8e75 100644
--- a/src/Data/Maybe/First.purs
+++ b/src/Data/Maybe/First.purs
@@ -7,7 +7,6 @@ import Control.MonadZero (class MonadZero, class Alternative, class Plus, class
 import Data.Eq (class Eq1)
 import Data.Functor.Invariant (class Invariant)
 import Data.Maybe (Maybe(..))
-import Data.Monoid (class Monoid, mempty)
 import Data.Newtype (class Newtype)
 import Data.Ord (class Ord1)
 
diff --git a/src/Data/Maybe/Last.purs b/src/Data/Maybe/Last.purs
index 71f8c11..0ae7eb5 100644
--- a/src/Data/Maybe/Last.purs
+++ b/src/Data/Maybe/Last.purs
@@ -7,7 +7,6 @@ import Control.MonadZero (class MonadZero, class Alternative, class Plus, class
 import Data.Eq (class Eq1)
 import Data.Functor.Invariant (class Invariant)
 import Data.Maybe (Maybe(..))
-import Data.Monoid (class Monoid, mempty)
 import Data.Newtype (class Newtype)
 import Data.Ord (class Ord1)