diff --git a/doc/Makefile.release b/doc/Makefile.release
index a8b3dc034b44dca539670eff6e7c2b806d91cb93..eb9f6bdc596e68b7a2cbb3b8c00654bb56e346a8 100644
--- a/doc/Makefile.release
+++ b/doc/Makefile.release
@@ -43,7 +43,7 @@ DEPENDENCIES_SUPPORTING_XCVB := \
 	GIT git://common-lisp.net/projects/xcvb/cl-launch.git ; \
 	GIT git://common-lisp.net/projects/qitab/command-line-arguments.git ; \
 	GIT git://common-lisp.net/users/frideau/fare-utils.git ; \
-	GIT git://common-lisp.net/users/frideau/fare-matcher.git ; \
+	GIT git://common-lisp.net/users/frideau/fare-quasiquote.git ; \
 	GIT git://common-lisp.net/users/frideau/fare-mop.git ; \
 	GIT git://common-lisp.net/users/frideau/fare-memoization.git ; \
 	GIT git://common-lisp.net/projects/qitab/inferior-shell.git ; \
@@ -55,6 +55,7 @@ DEPENDENCIES_SUPPORTING_XCVB := \
 	GIT git://common-lisp.net/projects/xcvb/quux-iolib.git
 
 DEPENDENCIES_STILL_USING_ASDF := \
+	GIT git://github.com/m2ym/optima.git ; \
 	: These are used by xcvb-test: ; \
 	DARCS http://dwim.hu/darcs/hu.dwim.asdf/ ; \
 	XDARCS http://dwim.hu/darcs/hu.dwim.stefil/
diff --git a/doc/README.rest b/doc/README.rest
index 843be34a1cf63e701d48af84eb23ddf713e4cf2b..25db8c8b9ea46f74afa0f632db210d016a0ca9f3 100644
--- a/doc/README.rest
+++ b/doc/README.rest
@@ -290,19 +290,19 @@ The dependencies that support XCVB natively include:
         - getting it, if you're frideau::
         	``git clone ssh://frideau@common-lisp.net/home/frideau/git/fare-utils.git``
 
-  * fare-matcher:
-	- homepage: http://cliki.net/fare-matcher
+  * fare-quasiquote:
+	- homepage: http://cliki.net/fare-quasiquote
 	- getting it:
-		``git clone git://common-lisp.net/users/frideau/fare-matcher.git``
-        - getting it, if you're a QITAB project member::
-        	``git clone ssh://frideau@common-lisp.net/home/frideau/git/fare-matcher.git``
+		``git clone git://common-lisp.net/users/frideau/fare-quasiquote.git``
+        - getting it, if you're me::
+        	``git clone ssh://frideau@common-lisp.net/home/frideau/git/fare-quasiquote.git``
 
   * fare-mop:
-	- homepage: http://cliki.net/fare-matcher
+	- homepage: http://cliki.net/fare-mop
 	- getting it:
-		``git clone git://common-lisp.net/users/frideau/fare-matcher.git``
+		``git clone git://common-lisp.net/users/frideau/fare-mop.git``
         - getting it, if you're a QITAB project member::
-        	``git clone ssh://frideau@common-lisp.net/home/frideau/git/fare-matcher.git``
+        	``git clone ssh://frideau@common-lisp.net/home/frideau/git/fare-mop.git``
 
   * quux-iolib:
 	- homepage: http://cliki.net/quux-iolib
@@ -600,7 +600,7 @@ The ``build.xcvb`` file for Exscribe_ is as follows::
            :nicknames ("exscribe")
            :supersedes-asdf ("exscribe")
            :build-depends-on ("/cl-launch" "/fare-utils"
-                              "/fare-matcher" "/scribble"
+                              "/fare-quasiquote" "/scribble"
                               (:asdf "cl-typesetting"))
            :depends-on ("scheme-compat" "exscribe"
                         "exscribe-html" "exscribe-txt" "exscribe-typeset")
diff --git a/t/specials.lisp b/t/specials.lisp
index 2ff4e5e37a62c867eaa49e5dc991c7887c54f980..5d5d14b8acfbb7a6650f86de7cc969a26046186a 100644
--- a/t/specials.lisp
+++ b/t/specials.lisp
@@ -60,8 +60,8 @@ spawning a new process for each build step.")
      :upstream "git://common-lisp.net/projects/qitab/command-line-arguments.git")
     ("/fare-utils" :systems (:fare-utils)
      :upstream "git://common-lisp.net/users/frideau/fare-utils.git")
-    ("/fare-matcher" :systems (:fare-matcher :fare-quasiquote-readtable)
-     :upstream "git://common-lisp.net/users/frideau/fare-matcher.git")
+    ("/fare-quasiquote" :systems (:fare-quasiquote :fare-quasiquote-readtables :fare-quasiquote-optima :fare-quasiquote-extras)
+     :upstream "git://common-lisp.net/users/frideau/fare-quasiquote.git")
     ("/fare-memoization" :systems (:fare-memoization)
      :upstream "git://common-lisp.net/users/frideau/fare-memoization.git")
     ("/hu.dwim.asdf" :systems (:hu.dwim.asdf)
@@ -82,6 +82,8 @@ spawning a new process for each build step.")
      :upstream "git://github.com/fare/lisp-interface-library.git")
     ("/rucksack" :systems (:rucksack)
      :repo "git://common-lisp.net/projects/xcvb/rucksack.git")
+    ("/optima" :systems (:optima)
+     :upstream "git://github.com/m2ym/optima.git")
     ("/poiu" :systems (:poiu)
      :upstream "git://common-lisp.net/projects/qitab/poiu.git")
     ("/quux-iolib" :systems (:quux-iolib)