diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2013 - 2016, Alexander Thiemann <mail@athiemann.net>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the name of Alexander Thiemann <mail@agrafix.net> nor the names of other
+      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
+OWNER 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/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/Spock-api-server.cabal b/Spock-api-server.cabal
new file mode 100644
--- /dev/null
+++ b/Spock-api-server.cabal
@@ -0,0 +1,30 @@
+name:                Spock-api-server
+version:             0.11.0.0
+synopsis:            Another Haskell web framework for rapid development
+description:         Server wiring for Spock-api APIs
+Homepage:            https://www.spock.li
+Bug-reports:         https://github.com/agrafix/Spock/issues
+license:             BSD3
+license-file:        LICENSE
+author:              Alexander Thiemann <mail@athiemann.net>
+maintainer:          Alexander Thiemann <mail@athiemann.net>
+copyright:           (c) 2013 - 2016 Alexander Thiemann
+category:            Web
+build-type:          Simple
+cabal-version:       >=1.8
+tested-with:         GHC==7.8.4, GHC==7.10.2, GHC==8.0.1
+
+library
+  hs-source-dirs:      src
+  exposed-modules:     Web.Spock.Api.Server
+  build-depends:
+                base >= 4 && < 5,
+                Spock-core >= 0.11,
+                Spock-api,
+                hvect >= 0.3.1,
+                mtl
+  ghc-options: -auto-all -Wall
+
+source-repository head
+  type:     git
+  location: https://github.com/agrafix/Spock
diff --git a/src/Web/Spock/Api/Server.hs b/src/Web/Spock/Api/Server.hs
new file mode 100644
--- /dev/null
+++ b/src/Web/Spock/Api/Server.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+module Web.Spock.Api.Server
+    ( defEndpoint )
+where
+
+import Web.Spock.Api
+import Web.Spock.Core
+
+import Control.Monad.Trans
+import Data.HVect
+import qualified Data.HVect as HV
+
+-- | Wire an 'Endpoint' defined using the @Spock-api@ package
+defEndpoint ::
+    forall p i o m ctx.
+    (MonadIO m, HasRep p)
+    => Endpoint p i o
+    -> HVectElim p (HVectElim (MaybeToList i) (ActionCtxT ctx m o))
+    -> SpockCtxT ctx m ()
+defEndpoint ep handler =
+    defEndpointCore (ep, step2)
+    where
+      step1 :: HVect p -> HVectElim (MaybeToList i) (ActionCtxT ctx m o)
+      step1 = HV.uncurry handler
+
+      step2 :: HVect p -> HVect (MaybeToList i) -> ActionCtxT ctx m o
+      step2 p = HV.uncurry (step1 p)
+
+defEndpointCore ::
+    forall p i o m ctx.
+    (MonadIO m, HasRep p)
+    => (Endpoint p i o, HVect p -> HVect (MaybeToList i) -> ActionCtxT ctx m o)
+    -> SpockCtxT ctx m ()
+defEndpointCore t =
+    case t of
+      (MethodGet path, handler) ->
+          let pf :: HVect p -> ActionCtxT ctx m ()
+              pf args =
+                  do r <- handler args HNil
+                     json r
+          in get path (HV.curry pf)
+      (MethodPost _ path, handler) ->
+          let pf :: HVect p -> ActionCtxT ctx m ()
+              pf args =
+                  do req <- jsonBody'
+                     r <- handler args (req :&: HNil)
+                     json r
+          in post path (HV.curry pf)
+      (MethodPut _ path, handler) ->
+          let pf :: HVect p -> ActionCtxT ctx m ()
+              pf args =
+                  do req <- jsonBody'
+                     r <- handler args (req :&: HNil)
+                     json r
+          in put path (HV.curry pf)