diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins
index 3fca10c..5b03f7f 100644
--- a/Dockerfile.jenkins
+++ b/Dockerfile.jenkins
@@ -1,6 +1,12 @@
 FROM schemers/chibi:head
 RUN apt-get update && apt-get install -y \
-    build-essential ca-certificates git make docker.io libffi-dev
+    build-essential \
+    ca-certificates \
+    git \
+    make \
+    docker.io \
+    libffi-dev \
+    pandoc
 RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1 \
     && cd chibi-scheme && make -j 16 && make -j 16 install
 WORKDIR /builddir
diff --git a/Dockerfile.test b/Dockerfile.test
index 345cd00..4349494 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -6,7 +6,8 @@ RUN apt-get update && apt-get install -y \
     make \
     libffi-dev \
     ca-certificates \
-    git
+    git \
+    pandoc
 ENV PATH=${PATH}:/usr/local-other/bin
 ARG SCHEME=chibi
 ENV COMPILE_R7RS=${SCHEME}
diff --git a/compile-r7rs.scm b/compile-r7rs.scm
index 6fcd9ae..65920e5 100644
--- a/compile-r7rs.scm
+++ b/compile-r7rs.scm
@@ -29,6 +29,7 @@
                        kawa
                        larceny
                        loko
+                       meevax
                        mit-scheme
                        mosh
                        racket
diff --git a/libs/data.sld b/libs/data.sld
index fbfec94..847f599 100644
--- a/libs/data.sld
+++ b/libs/data.sld
@@ -105,7 +105,7 @@
                                                ,input-file)))))
         (cyclone
           (type . compiler)
-          #;(library-command . ,(lambda (library-file prepend-directories append-directories r6rs?)
+          (library-command . ,(lambda (library-file prepend-directories append-directories r6rs?)
                                 (apply string-append
                                        `("cyclone"
                                          " "
@@ -113,7 +113,9 @@
                                          " "
                                          ,@(map (lambda (item) (string-append "-I " item " ")) prepend-directories)
                                          ,@(map (lambda (item) (string-append "-A " item " ")) append-directories)
-                                         ,library-file))))
+                                         ,(search-library-file (append prepend-directories
+                                                                       append-directories)
+                                                               library-file)))))
           (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
                         (apply string-append
                                `("cyclone "
@@ -122,12 +124,14 @@
                                  ,@(map (lambda (item) (string-append "-I " item " ")) prepend-directories)
                                  ,@(map (lambda (item) (string-append "-A " item " ")) append-directories)
                                  ,input-file
-                                 " && "
-                                 "mv "
-                                 ,(string-cut-from-end input-file 4)
-                                 " "
-                                 ,output-file
-                                 )))))
+                                 ,(if (not (string=? (string-cut-from-end input-file 4) output-file))
+                                    (string-append
+                                      " && "
+                                      "mv "
+                                      (string-cut-from-end input-file 4)
+                                      " "
+                                      output-file)
+                                    ""))))))
         (foment
           (type . interpreter)
           (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
@@ -372,6 +376,22 @@
                                ,input-file
                                " "
                                "--eval \"(exit 0)\"")))))
+      (meevax
+        (type . interpreter)
+        (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
+                      (apply string-append
+                             `("meevax"
+                               " "
+                               ,(util-getenv "COMPILE_R7RS_MEEVAX")
+                               " "
+                               ,@(map (lambda (item)
+                                        (string-append "-I" " " item " "))
+                                      prepend-directories)
+                               " "
+                               ,@(map (lambda (item)
+                                        (string-append "-A" " " item " "))
+                                      append-directories)
+                               ,input-file)))))
       (mosh
         (type . interpreter)
         (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)