diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 ## Changelog
 
-#### 0.19.4 (2014-10-21)
+#### 0.19.4.2 (2015-01-05)
+
+* Allow `fay 0.22.*`.
+
+#### 0.19.4.1 (2014-10-25)
+
+* Merged fay-base into the main fay repository.
+
+### 0.19.4 (2014-10-21)
 
 * Fix type signature of `Data.Text.pack`.
 * Add IsString instance for `Text` for using the ffi with `RebindableSyntax` enabled.
diff --git a/fay-base.cabal b/fay-base.cabal
--- a/fay-base.cabal
+++ b/fay-base.cabal
@@ -1,5 +1,5 @@
 name:                fay-base
-version:             0.19.4.1
+version:             0.19.4.2
 synopsis:            The base package for Fay.
 description:         The base package for Fay.
                      This package amongst others exports Prelude and FFI which you probably want to use with Fay.
@@ -59,4 +59,4 @@
     Unsafe.Coerce
   build-depends:
       base == 4.*
-    , fay >= 0.21.1 && < 0.22
+    , fay >= 0.21.1 && < 0.23
diff --git a/src/Data/Ratio.hs b/src/Data/Ratio.hs
--- a/src/Data/Ratio.hs
+++ b/src/Data/Ratio.hs
@@ -1,8 +1,8 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE PackageImports #-}
+{-# OPTIONS -fno-warn-missing-methods #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# OPTIONS -w #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE PackageImports #-}
 
 module Data.Ratio where
 
diff --git a/src/Data/Text.hs b/src/Data/Text.hs
--- a/src/Data/Text.hs
+++ b/src/Data/Text.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS -fno-warn-missing-methods #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE EmptyDataDecls #-}
 {-# LANGUAGE NoImplicitPrelude #-}
@@ -62,7 +63,7 @@
 import Data.Data
 import FFI
 import Data.Nullable (fromNullable)
-import Prelude (Eq,String,Int,Bool,Char,Maybe,Double,error)
+import Prelude (Eq,String,Int,Bool,Char,Maybe,Double,Ord,error)
 import qualified "base" Data.String as B (IsString (..))
 
 -- | A space efficient, packed, unboxed Unicode text type.
@@ -70,6 +71,7 @@
 deriving instance Eq Text
 deriving instance Data Text
 deriving instance Typeable Text
+instance Ord Text
 instance B.IsString Text where fromString = error "the method fromString can never be called"
 
 -- | O(n) The intercalate function takes a Text and a list of Texts and
diff --git a/src/Prelude.hs b/src/Prelude.hs
--- a/src/Prelude.hs
+++ b/src/Prelude.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE PackageImports       #-}
 {-# LANGUAGE TypeSynonymInstances #-}
-{-# OPTIONS -w #-}
+{-# OPTIONS -fno-warn-missing-methods #-}
 
 module Prelude
   (