diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright Michael Melanson, 2010
+
+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 Michael Melanson 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/Network/Websocket.hs b/Network/Websocket.hs
new file mode 100644
--- /dev/null
+++ b/Network/Websocket.hs
@@ -0,0 +1,104 @@
+-- | Library for creating Websocket servers.  Some parts cribbed from
+-- Jeff Foster's blog post at
+-- <http://www.fatvat.co.uk/2010/01/web-sockets-and-haskell.html>
+module Network.Websocket( Config(..), WS(..), startServer, send) where
+
+    import Char
+    import Control.Concurrent
+    import Control.Monad (forever)
+    import qualified Network as N
+    import qualified Network.Socket as NS
+    import System.IO
+
+
+
+    -- | Server configuration structure
+    data Config = Config {
+          -- | The port to bind to
+          configPort :: Int,
+
+          -- | The origin URL used in the handshake
+          configOrigin :: String,
+
+          -- |The location URL used in the handshake. This must match
+          -- the Websocket url that the browsers connect to.
+          configLocation  :: String,
+
+          -- | The onopen callback, called when a socket is opened
+          configOnOpen    :: WS -> IO (),
+
+          -- | The onmessage callback, called when a message is received
+          configOnMessage :: WS -> String -> IO (),
+
+          -- | The onclose callback, called when the connection is closed.
+          configOnClose   :: WS -> IO ()
+        }
+
+    -- | Connection state structure
+    data WS = WS { 
+          -- | The server's configuration
+          config :: Config,
+
+          -- | The handle of the connected socket
+          handle :: Handle
+        }
+    
+    -- |Calls the server's onopen callback, then start reading
+    -- |messages. When the connection is terminated, the server's
+    -- |onclose callback is called.
+    listenLoop ws =
+        do onopen ws
+           
+           (forever $ do
+              msg <- readFrame h
+              onmessage ws msg) `catch` (\e -> onclose ws)
+
+        where c = config ws
+              h = handle ws
+
+              onopen    = configOnOpen c 
+              onmessage = configOnMessage c
+              onclose   = configOnClose c
+
+
+    readFrame :: Handle -> IO String
+    readFrame h = readUntil h ""
+        where readUntil h str =
+                  do new <- hGetChar h
+                     if new == chr 0
+                        then readUntil h ""
+                        else if new == chr 255
+                                then return str
+                                else readUntil h (str ++ [new])
+
+    sendFrame :: Handle -> String -> IO ()
+    sendFrame h s = do
+      hPutChar h (chr 0)
+      hPutStr h s
+      hPutChar h (chr 255)
+
+    -- | Send a message to the connected browser.
+    send ws = sendFrame (handle ws)
+
+    accept config socket =
+        forever $ do
+          (h, _, _) <- N.accept socket
+          hPutStr h handshake
+          hSetBuffering h NoBuffering
+          let ws = WS { config = config, handle = h }
+          forkIO $ listenLoop ws
+
+        where handshake = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n\
+                          \Upgrade: WebSocket\r\n\
+                          \Connection: Upgrade\r\n\
+                          \WebSocket-Origin: " ++ (configOrigin config) ++ "\r\n\
+                          \WebSocket-Location: "++ (configLocation config) ++ "\r\n\
+                          \WebSocket-Protocol: sample\r\n\r\n"
+
+    -- | Start a websocket server
+    startServer config =
+        do let port = N.PortNumber $ fromIntegral (configPort config)
+           socket <- N.listenOn port
+           accept config socket
+           NS.sClose socket
+           return ()
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/network-websocket.cabal b/network-websocket.cabal
new file mode 100644
--- /dev/null
+++ b/network-websocket.cabal
@@ -0,0 +1,15 @@
+Name:		network-websocket
+Synopsis: 	WebSocket library
+Version:	0.1
+Cabal-Version:	>= 1.2
+License:	BSD3
+License-File:   LICENSE
+Author:		Michael Melanson <michael@michaelmelanson.net>
+Maintainer:     Michael Melanson <michael@michaelmelanson.net>
+Category:	Network
+Build-Type:	Simple
+
+Library
+  Build-Depends:	base >= 2 && < 4, network, haskell98
+  Exposed-Modules:	Network.Websocket
+