diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.1.6
+
+Generalized return type in `runGeneralTCPServer`.
+
 ## 1.1.5
 
 Added `sinkParserEither` ([pull request #189](https://github.com/snoyberg/conduit/pull/189))
diff --git a/Data/Conduit/Network.hs b/Data/Conduit/Network.hs
--- a/Data/Conduit/Network.hs
+++ b/Data/Conduit/Network.hs
@@ -140,7 +140,7 @@
 runGeneralTCPServer :: MonadBaseControl IO m
                     => SN.ServerSettings
                     -> (SN.AppData -> m ())
-                    -> m ()
+                    -> m a
 runGeneralTCPServer set f = liftBaseWith $ \run ->
     SN.runTCPServer set $ void . run . f
 
diff --git a/conduit-extra.cabal b/conduit-extra.cabal
--- a/conduit-extra.cabal
+++ b/conduit-extra.cabal
@@ -1,5 +1,5 @@
 Name:                conduit-extra
-Version:             1.1.5.1
+Version:             1.1.6
 Synopsis:            Batteries included conduit: adapters for common libraries.
 Description:
     The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit.