diff --git a/TODO b/TODO
index 174a06a805bd5578b276c583de5307ce93682115..bea53d0f2e7ff0c2e3de4618441c564d031c0ef7 100644
--- a/TODO
+++ b/TODO
@@ -185,6 +185,7 @@
 *** have a function verify-strict-asd that can verify a asd is pure lp#541562
    Then if it passes, use load-strict-asd.
    If not, optionally issue a warning. Start migrating people toward that.
+*** Include tests for prebuilt-system in test-bundle and in test-program.
 
 * Learn to use cl-grid-test
 ** So we can easily make sure ASDF changes don't break stuff,
diff --git a/bundle.lisp b/bundle.lisp
index 5df9499e9d8be547fee0603118abaa4533617d46..27696b575afffae64b74018fd6f2cb03aec33152 100644
--- a/bundle.lisp
+++ b/bundle.lisp
@@ -353,22 +353,24 @@ itself.")) ;; operation on a system and its dependencies
   (defmethod trivial-system-p ((s prebuilt-system))
     t)
 
-  (defmethod perform ((o lib-op) (c prebuilt-system))
+  (defmethod perform ((o link-op) (c prebuilt-system))
     nil)
 
-  (defmethod component-depends-on ((o lib-op) (c prebuilt-system))
-    nil)
+  (defmethod perform ((o basic-fasl-op) (c prebuilt-system))
+    nil))
 
-  (defmethod component-depends-on ((o monolithic-lib-op) (c prebuilt-system))
+  (defmethod perform ((o lib-op) (c prebuilt-system))
     nil)
 
-  #+mkcl
-  (defmethod perform ((o fasl-op) (c prebuilt-system))
+  (defmethod perform ((o dll-op) (c prebuilt-system))
+    nil))
+
+  (defmethod component-depends-on ((o gather-op) (c prebuilt-system))
     nil)
 
-  #+mkcl
   (defmethod output-files ((o lib-op) (c prebuilt-system))
-    (list (prebuilt-system-static-library c))))
+    (values (list (prebuilt-system-static-library c)) t))
+
 
 
 ;;;