diff --git a/kawaii.cabal b/kawaii.cabal
--- a/kawaii.cabal
+++ b/kawaii.cabal
@@ -3,16 +3,22 @@
 -- see: https://github.com/sol/hpack
 
 name:           kawaii
-version:        0.0.1.0
+version:        0.0.1.1
 synopsis:       Utilities for serving static sites and blogs with Wai/Warp
 category:       Web
 homepage:       https://phabricator.chromabits.com/diffusion/KWAI/
+author:         Eduardo Trujillo <ed@chromabits.com>
 maintainer:     Eduardo Trujillo <ed@chromabits.com>
 license:        Apache
 license-file:   LICENSE
 build-type:     Simple
 cabal-version:  >= 1.10
 
+flag hakyll
+  description: Include Hakyll utilities
+  manual: False
+  default: True
+
 library
   hs-source-dirs:
       src
@@ -24,7 +30,6 @@
     , text
     , lens
     , bytestring
-    , hakyll
     , optparse-applicative
     , warp == 3.*
     , warp-tls == 3.*
@@ -38,8 +43,12 @@
     , mtl
     , monad-logger
     , monad-control
+  if flag(hakyll)
+    build-depends:
+        hakyll
+    exposed-modules:
+        Hakyll.Serve.Main
   exposed-modules:
-      Hakyll.Serve.Main
       Network.Wai.Serve
       Network.Wai.Serve.Applications
       Network.Wai.Serve.Listeners
@@ -61,7 +70,6 @@
     , text
     , lens
     , bytestring
-    , hakyll
     , optparse-applicative
     , warp == 3.*
     , warp-tls == 3.*
@@ -75,7 +83,10 @@
     , mtl
     , monad-logger
     , monad-control
-    , hakyll-serve
+    , kawaii
     , hspec
     , QuickCheck
+  if flag(hakyll)
+    build-depends:
+        hakyll
   default-language: Haskell2010