diff --git a/examples/iolib.examples.asd b/examples/iolib.examples.asd
deleted file mode 100644
index bf6a6ad1580c17795610d4b8ee065e5e8674cf93..0000000000000000000000000000000000000000
--- a/examples/iolib.examples.asd
+++ /dev/null
@@ -1,36 +0,0 @@
-;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
-;;;
-;;; This file was originally written by Peter Keller (psilord@cs.wisc.edu)
-;;; and this code is released under the same license as IOLib.
-;;;
-
-(asdf:defsystem :iolib.examples
-  :version #.(with-open-file (f (merge-pathnames "../version.lisp-expr"
-                                                 (or *compile-file-pathname*
-                                                     *load-truename*)))
-               (read f))
-  :defsystem-depends-on (:iolib.base)
-  :depends-on (:iolib :bordeaux-threads)
-  :default-component-class :iolib-source-file
-  :components ((:file "package")
-               (:file "ex1-client" :depends-on ("package"))
-               (:file "ex2-client" :depends-on ("package"))
-               (:file "ex3-client" :depends-on ("package"))
-               (:file "ex4-client" :depends-on ("package"))
-               (:file "ex5a-client" :depends-on ("package"))
-               (:file "ex5b-client" :depends-on ("package"))
-
-               (:file "ex1-server" :depends-on ("package"))
-               (:file "ex2-server" :depends-on ("package"))
-               (:file "ex3-server" :depends-on ("package"))
-               (:file "ex4-server" :depends-on ("package"))
-               (:file "ex5-server" :depends-on ("package"))
-               (:file "ex6-server" :depends-on ("package"))
-               (:file "ex7-buffer" :depends-on ("package"))
-               (:file "ex7-server" :depends-on ("package" "ex7-buffer"))
-               (:file "ex8-buffer" :depends-on ("package"))
-               (:file "ex8-server" :depends-on ("package" "ex8-buffer"))))
-
-
-
-
diff --git a/examples/package.lisp b/examples/package.lisp
index 7658c45558cc1c4e5be52a5a787f61e816b341b3..049a204022de8ea6bec4473074ff62e0e1343424 100644
--- a/examples/package.lisp
+++ b/examples/package.lisp
@@ -2,6 +2,7 @@
 ;;;; and this code is released under the same license as IOLib.
 
 (defpackage :iolib.examples
+  (:nicknames :iolib/examples)
   (:use :cl :iolib :bordeaux-threads)
   #+sb-package-locks
   (:lock t)
diff --git a/iolib.asd b/iolib.asd
index acf18badcd348c5dd15b5ade91df4c34b8e9835d..2c557c4e78537b2d696b46ccee75b36ee02c06dd 100644
--- a/iolib.asd
+++ b/iolib.asd
@@ -344,3 +344,28 @@
   :encoding :utf-8
   :pathname "src/iolib/"
   :components ((:file "pkgdcl")))
+
+(asdf:defsystem :iolib/examples
+  :version (:read-file-form "version.lisp-expr")
+  :defsystem-depends-on (:iolib/base)
+  :depends-on (:iolib :bordeaux-threads)
+  :around-compile "iolib/asdf:compile-wrapper"
+  :pathname "examples/"
+  :components ((:file "package")
+               (:file "ex1-client" :depends-on ("package"))
+               (:file "ex2-client" :depends-on ("package"))
+               (:file "ex3-client" :depends-on ("package"))
+               (:file "ex4-client" :depends-on ("package"))
+               (:file "ex5a-client" :depends-on ("package"))
+               (:file "ex5b-client" :depends-on ("package"))
+
+               (:file "ex1-server" :depends-on ("package"))
+               (:file "ex2-server" :depends-on ("package"))
+               (:file "ex3-server" :depends-on ("package"))
+               (:file "ex4-server" :depends-on ("package"))
+               (:file "ex5-server" :depends-on ("package"))
+               (:file "ex6-server" :depends-on ("package"))
+               (:file "ex7-buffer" :depends-on ("package"))
+               (:file "ex7-server" :depends-on ("package" "ex7-buffer"))
+               (:file "ex8-buffer" :depends-on ("package"))
+               (:file "ex8-server" :depends-on ("package" "ex8-buffer"))))