diff --git a/crepbook.cls b/crepbook.cls
index 3295dd91..7bd3baa7 100644
--- a/crepbook.cls
+++ b/crepbook.cls
@@ -154,7 +154,7 @@
 
 \newcommand{\lilypond}[1]{%
   \iflilypond%
-  \includegraphics{#1}
+  \IfFileExists{./lilypond/#1.pdf}{\includegraphics{./lilypond/#1}}{}%
   \fi%
 }
 
diff --git a/makefile b/makefile
index e813aeda..88369d2b 100644
--- a/makefile
+++ b/makefile
@@ -43,7 +43,7 @@ LILYPOND=$(ECHO) "** lilypond not found" >&2 ; $(ECHO) lilypond
 LILYFILE=''
 else
 LILYPOND=lilypond
-LILYSRC=$(wildcard songs/*/*.ly)
+LILYSRC=$(wildcard lilypond/*.ly)
 LILYFILE=$(LILYSRC:%.ly=%.pdf)
 endif