diff --git a/mkly b/mkly
index 1fd78ad..1692c82 100755
--- a/mkly
+++ b/mkly
@@ -150,13 +150,14 @@
                    (when subdir
                      (chdir subdir)
                      (set! project-name (getcwd-base)))
-                   (use-dir! (format #f "~:[output-~a~;output/~]" branch branch)))))
+                   (use-dir! (format #f "output~@[-~a~]/" branch)))))
     ;; A main.ly could also exist both in the root and in the
     ;; sub-directories, but this will just compile the root main.ly regardless.
     `((all main.ly part-*.ly)
       (dev lilypond
            -o ,(string-append dest project-name "-pacON")
            main.ly)
+      (parts part-*.ly)
       (main.ly lilypond -dno-point-and-click
                -o ,(string-append dest project-name)
                ,target)
@@ -177,7 +178,8 @@
 ;;  return the rule whose TARGET matched.
 (define (select-rule rules target)
   (if (null? rules)
-      (begin (debug "mkly: no matching rule") #f)
+      (begin (debug "mkly: no matching rule~%")
+             #f)
       (let* ((rule         (first rules))
              (pattern      (first rule))
              (rule-command (rest rule)))
@@ -233,3 +235,7 @@
         (loop (rest targets))))))
 
 (main (option-ref options '() #f))
+
+;; Local Variables:
+;; geiser-scheme-implementation: guile
+;; End: