diff --git a/stack-ghc-7.8.4.yaml b/stack-ghc-7.8.4.yaml
index 679b2b52..23965e9f 100644
--- a/stack-ghc-7.8.4.yaml
+++ b/stack-ghc-7.8.4.yaml
@@ -5,7 +5,6 @@ packages:
 - servant-cassava/
 - servant-client/
 - servant-docs/
-- servant-examples/
 - servant-foreign/
 - servant-js/
 - servant-lucid/
@@ -24,5 +23,5 @@ extra-deps:
 - stm-delay-0.1.1.1
 - control-monad-omega-0.3.1
 - http-api-data-0.1.1.1
-- should-not-typecheck-2.0.1
+- should-not-typecheck-2.1.0
 resolver: lts-2.22
diff --git a/stack-ghc-8.0.1.yaml b/stack-ghc-8.0.1.yaml
new file mode 100644
index 00000000..dcfb8e5f
--- /dev/null
+++ b/stack-ghc-8.0.1.yaml
@@ -0,0 +1,166 @@
+flags:
+  time-locale-compat:
+    old-locale: false
+packages:
+- servant/
+- servant-blaze/
+- servant-cassava/
+- servant-client/
+- servant-docs/
+- servant-foreign/
+- servant-js/
+- servant-lucid/
+- servant-mock/
+- servant-server/
+setup-info:
+  ghc:
+    linux64:
+      8.0.0.20160421:
+        url: https://downloads.haskell.org/~ghc/8.0.1-rc4/ghc-8.0.0.20160421-x86_64-unknown-linux.tar.xz
+    macosx:
+      8.0.0.20160421:
+        url: https://downloads.haskell.org/~ghc/8.0.1-rc4/ghc-8.0.0.20160421-x86_64-apple-darwin.tar.xz
+extra-deps:
+- Diff-0.3.4
+- HUnit-1.3.1.1
+- QuickCheck-2.8.2
+- StateVar-1.1.0.4
+- adjunctions-4.3
+- aeson-0.11.2.0
+- aeson-pretty-0.7.2
+- ansi-terminal-0.6.2.3
+- ansi-wl-pprint-0.6.7.3
+- appar-0.1.4
+- asn1-encoding-0.9.3
+- asn1-parse-0.9.4
+- asn1-types-0.3.2
+- async-2.1.0
+- attoparsec-0.13.0.2
+- auto-update-0.1.4
+- base-compat-0.9.1
+- base-orphans-0.5.4
+- base64-bytestring-1.0.0.1
+- bifunctors-5.3
+- blaze-builder-0.4.0.2
+- blaze-html-0.8.1.1
+- blaze-markup-0.7.0.3
+- byteable-0.1.1
+- byteorder-1.0.4
+- bytestring-builder-0.10.6.0.0
+- bytestring-conversion-0.3.1
+- case-insensitive-1.2.0.6
+- cassava-0.4.5.0
+- cereal-0.5.1.0
+- charset-0.3.7.1
+- cmdargs-0.10.14
+- comonad-5
+- connection-0.2.5
+- contravariant-1.4
+- control-monad-omega-0.3.1
+- cookie-0.4.2
+- cryptonite-0.15
+- data-default-class-0.0.1
+- distributive-0.5.0.2
+- dlist-0.7.1.2
+- doctest-0.11.0
+- double-conversion-2.0.1.0
+- easy-file-0.2.1
+- exceptions-0.8.2.1
+- fail-4.9.0.0
+- fast-logger-2.4.6
+- file-embed-0.0.10
+- filemanip-0.3.6.3
+- free-4.12.4
+- ghc-paths-0.1.0.9
+- hashable-1.2.4.0
+- hex-0.1.2
+- hourglass-0.2.10
+- hspec-2.2.3
+- hspec-core-2.2.3
+- hspec-discover-2.2.3
+- hspec-expectations-0.7.2
+- hspec-wai-0.6.6
+- http-api-data-0.2.2
+- http-client-0.4.28
+- http-client-tls-0.2.4
+- http-date-0.0.6.1
+- http-media-0.6.3
+- http-types-0.9
+- http2-1.6.0
+- iproute-1.7.0
+- kan-extensions-5.0.1
+- language-ecmascript-0.17.1.0
+- lens-4.14
+- lifted-base-0.2.3.6
+- lucid-2.9.5
+- memory-0.12
+- mime-types-0.1.0.7
+- mmorph-1.0.6
+- monad-control-1.0.1.0
+- mtl-2.2.1
+- network-2.6.2.1
+- network-uri-2.6.1.0
+- old-locale-1.0.0.7
+- old-time-1.1.0.3
+- optparse-applicative-0.12.1.0
+- parallel-3.2.1.0
+- parsec-3.1.9
+- pem-0.2.2
+- prelude-extras-0.4.0.3
+- primitive-0.6.1.0
+- profunctors-5.2
+- psqueues-0.2.2.1
+- quickcheck-instances-0.3.12
+- quickcheck-io-0.1.2
+- random-1.1
+- reflection-2.1.2
+- resourcet-1.1.7.4
+- safe-0.3.9
+- scientific-0.3.4.6
+- semigroupoids-5.0.1
+- semigroups-0.18.1
+- setenv-0.1.1.3
+- should-not-typecheck-2.1.0
+- simple-sendfile-0.2.21
+- socks-0.5.5
+- split-0.2.3.1
+- stm-2.4.4.1
+- streaming-commons-0.1.15.4
+- string-conversions-0.4
+- stringsearch-0.3.6.6
+- syb-0.6
+- system-filepath-0.4.13.4
+- tagged-0.8.4
+- tagshare-0.0
+- temporary-1.2.0.4
+- testing-feat-0.4.0.3
+- text-1.2.2.1
+- tf-random-0.5
+- time-locale-compat-0.1.1.1
+- tls-1.3.7
+- transformers-base-0.4.4
+- transformers-compat-0.5.1.4
+- uniplate-1.6.12
+- unix-compat-0.4.1.4
+- unix-time-0.3.6
+- unordered-containers-0.2.7.0
+- url-2.1.3
+- utf8-string-1.0.1.1
+- vault-0.3.0.6
+- vector-0.11.0.0
+- void-0.7.1
+- wai-3.2.1
+- wai-app-static-3.1.5
+- wai-extra-3.0.15.1
+- wai-logger-2.2.7
+- warp-3.2.6
+- with-location-0.1.0
+- wl-pprint-1.2
+- word8-0.1.2
+- x509-1.6.3
+- x509-store-1.6.1
+- x509-system-1.6.3
+- x509-validation-1.6.3
+- zlib-0.6.1.1
+compiler-check: match-exact
+resolver: ghc-8.0.0.20160421