diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,10 @@
     compiler: ": #stack 7.10.3"
     addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
 
+  - env: BUILD=stack ARGS="--resolver lts-7"
+    compiler: ": #stack 8.0.1"
+    addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}}
+
   # Nightly builds are allowed to fail
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly"
@@ -73,8 +77,8 @@
     compiler: ": #stack 7.8.4 osx"
     os: osx
 
-  - env: BUILD=stack ARGS="--resolver lts-6"
-    compiler: ": #stack 7.10.3 osx"
+  - env: BUILD=stack ARGS="--resolver lts-7"
+    compiler: ": #stack 8.0.1 osx"
     os: osx
 
   - env: BUILD=stack ARGS="--resolver nightly"
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## 0.8.0.4 (2016-10-26)
+
+Fixes:
+  - Support for optparse-applicative 0.13.x.
+  - Bump hspec bounds.
+
 ## 0.8.0.3 (2016-07-15)
 
 Fixes:
diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,7 @@
 }:
 mkDerivation {
   pname = "hpio";
-  version = "0.8.0.3";
+  version = "0.8.0.4";
   src = ./.;
   isLibrary = true;
   isExecutable = true;
diff --git a/examples/Gpio.hs b/examples/Gpio.hs
--- a/examples/Gpio.hs
+++ b/examples/Gpio.hs
@@ -9,6 +9,7 @@
 import Control.Monad.Catch (MonadMask)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Data.Foldable (for_)
+import Data.Monoid ((<>))
 import Options.Applicative
 import System.GPIO.Linux.Sysfs (runSysfsGpioIO)
 import System.GPIO.Monad
diff --git a/examples/GpioReader.hs b/examples/GpioReader.hs
--- a/examples/GpioReader.hs
+++ b/examples/GpioReader.hs
@@ -18,6 +18,7 @@
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Control.Monad.Reader (MonadReader(..), ReaderT(..), asks)
 import Data.Foldable (for_)
+import Data.Monoid ((<>))
 import Options.Applicative
 import System.GPIO.Linux.Sysfs (SysfsIOT, SysfsGpioT, runSysfsGpioT, runSysfsIOT, runSysfsGpioIO)
 import System.GPIO.Monad
diff --git a/examples/Sysfs.hs b/examples/Sysfs.hs
--- a/examples/Sysfs.hs
+++ b/examples/Sysfs.hs
@@ -18,6 +18,7 @@
 import Control.Monad (forever, void)
 import Control.Monad.IO.Class (liftIO)
 import Data.Foldable (for_)
+import Data.Monoid ((<>))
 import Options.Applicative
 import System.GPIO.Linux.Sysfs.IO (SysfsIOT(..))
 import System.GPIO.Linux.Sysfs.Monad
diff --git a/hpio.cabal b/hpio.cabal
--- a/hpio.cabal
+++ b/hpio.cabal
@@ -1,5 +1,5 @@
 Name:                   hpio
-Version:                0.8.0.3
+Version:                0.8.0.4
 Cabal-Version:          >= 1.10
 Build-Type:             Simple
 Author:                 Drew Hess <src@drewhess.com>
@@ -127,7 +127,7 @@
                       , hpio
                       , mtl
                       , mtl-compat
-                      , optparse-applicative >= 0.11.0 && < 0.13
+                      , optparse-applicative >= 0.11.0 && < 0.14
                       , transformers
                       , transformers-compat
   Default-Language:     Haskell2010
@@ -220,7 +220,7 @@
                       , directory
                       , exceptions
                       , filepath
-                      , hspec               >= 2.1.7 && < 2.3
+                      , hspec               >= 2.1.7 && < 2.4
                       , mtl
                       , mtl-compat
                       , text
@@ -257,4 +257,4 @@
 Source-Repository this
   Type:                 git
   Location:             git://github.com/dhess/hpio.git
-  Tag:                  v0.8.0.3
+  Tag:                  v0.8.0.4
diff --git a/shell.nix b/shell.nix
--- a/shell.nix
+++ b/shell.nix
@@ -11,7 +11,7 @@
       }:
       mkDerivation {
         pname = "hpio";
-        version = "0.8.0.3";
+        version = "0.8.0.4";
         src = ./.;
         isLibrary = true;
         isExecutable = true;
@@ -38,6 +38,13 @@
                        then pkgs.haskellPackages
                        else pkgs.haskell.packages.${compiler};
 
+  # Test with optparse-applicative-0.13.0.0.
+  # modifiedHaskellPackages = haskellPackages.override {
+  #     overrides = self: super: {
+  #       optparse-applicative = self.optparse-applicative_0_13_0_0;
+  #     };
+  # };
+  #drv = modifiedHaskellPackages.callPackage f {};
   drv = haskellPackages.callPackage f {};
 
 in
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,6 +1,6 @@
 require-stack-version: ">= 1.1.0"
 pvp-bounds: both
-resolver: lts-6.2
+resolver: lts-7.5
 packages:
 - .
 flags: