diff --git a/packages.lisp b/packages.lisp
index 312e5b2..a2bd022 100644
--- a/packages.lisp
+++ b/packages.lisp
@@ -37,8 +37,6 @@
         :flexi-streams
         :puri)
   (:shadow :defconstant)
-  ;; see asdf system definition
-  (:import-from :toot-asd :*toot-version*)
   (:export
 
    :*toot-version*
@@ -198,3 +196,6 @@
    :+http-unsupported-media-type+
    :+http-use-proxy+
    :+http-version-not-supported+))
+
+;; see asdf system definition
+(defparameter toot:*toot-version* #.toot-asd::*toot-version*)
diff --git a/set-timeouts.lisp b/set-timeouts.lisp
index 716bef6..c82463f 100644
--- a/set-timeouts.lisp
+++ b/set-timeouts.lisp
@@ -48,6 +48,12 @@ set."
   #+:clisp
   (when write-timeout
     (socket:socket-options (usocket:socket usocket) :SO-SNDTIMEO write-timeout))
+  #+:ecl
+  (when write-timeout
+    (setf (sb-bsd-sockets:sockopt-send-timeout (usocket:socket usocket)) write-timeout))
+  #+:ecl
+  (when read-timeout
+    (setf (sb-bsd-sockets:sockopt-receive-timeout (usocket:socket usocket)) read-timeout))
   #+:openmcl
   (when read-timeout
     (setf (ccl:stream-input-timeout (usocket:socket usocket)) read-timeout))
@@ -61,6 +67,6 @@ set."
   #+:cmu
   (setf (lisp::fd-stream-timeout (usocket:socket-stream usocket))
         (coerce read-timeout 'integer))
-  #-(or :clisp :allegro :openmcl :sbcl :lispworks :cmu)
+  #-(or :ecl :clisp :allegro :openmcl :sbcl :lispworks :cmu)
   (not-implemented 'set-timeouts))
 
diff --git a/toot-test-server.asd b/toot-test-server.asd
new file mode 100644
index 0000000..d3cff53
--- /dev/null
+++ b/toot-test-server.asd
@@ -0,0 +1,30 @@
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz.  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.
+
+;;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESSED
+;;; 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 AUTHOR 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.
+
+(defsystem :toot-test-server
+  :description "Sample server based on TOOT"
+  :depends-on (:toot)
+  :components ((:file "tests")))
diff --git a/toot.asd b/toot.asd
index f0ca67f..978a90f 100644
--- a/toot.asd
+++ b/toot.asd
@@ -34,8 +34,6 @@
   "A string denoting the current version of Toot. Used for diagnostic
 output.")
 
-;(export '*toot-version*)
-
 (defsystem :toot
   :description "A minimal web server originally built by stripping down Edi Weitz's Hunchentoot"
   :serial t
@@ -50,6 +48,8 @@ output.")
                :md5
                :trivial-backtrace
                :usocket
+	       #+ecl
+	       :sb-bsd-sockets
                :bordeaux-threads
                :puri)
   :components ((:file "packages")
@@ -64,5 +64,4 @@ output.")
                (:file "log")
                (:file "http")
                (:file "api")
-               (:file "tests")
                (:file "documentation")))