diff --git a/thumbnail.c b/thumbnail.c
index b1e0116a75b28b4c744359ec98ae681ddcdfcf23..b5aa4a6e2e2f9edc99bb75443f3d6208f5b64562 100644
--- a/thumbnail.c
+++ b/thumbnail.c
@@ -38,10 +38,13 @@ int main(int argc, char *argv[])
 	/* Prepare arguments */
 	jobid = atoi(argv[1]);
 	ping_job(jobid, "running", 0);
-	src = buildpath(getenv(WORKER_RELEASED), jstr(jlookup(argv[4], "path"), 0));
+	if (jlookup(argv[4], "srcurl"))
+		src = jstr(jlookup(argv[4], "srcurl"), 0);
+	else
+		src = buildpath(getenv(WORKER_RELEASED), jstr(jlookup(argv[4], "src"), 0));
 	tmp = mprintf("%s/.tmp-%i", getenv(WORKER_TMP), jobid);
-	dest = mprintf("%s/thumbnail/l_%s.jpg", getenv(WORKER_RELEASED),
-			jstr(jlookup(argv[4], "lectureid"), "0"));
+	dest = mprintf("%s/thumbnail/%s", getenv(WORKER_RELEASED),
+			jstr(jlookup(argv[4], "filename"), "0"));
 
 	/* Open src */
 	demux = 0;