diff --git a/src/main/java/org/olat/course/PersistingCourseImpl.java b/src/main/java/org/olat/course/PersistingCourseImpl.java
index 84847c2235a75b480d8bfda8ddc443521bc393c9..d8fbfe4a2d7b98a091727156be4bdbb2389861cc 100644
--- a/src/main/java/org/olat/course/PersistingCourseImpl.java
+++ b/src/main/java/org/olat/course/PersistingCourseImpl.java
@@ -318,8 +318,9 @@ public class PersistingCourseImpl implements ICourse, OLATResourceable, Serializ
 			FileUtils.copyFileToDir(new File(fCourseBase, RUNSTRUCTURE_XML), exportDirectory, "course export runstructure");
 		}
 		
-		// fxdiff: export layout-folder
-		FileUtils.copyDirToDir(new OlatRootFolderImpl(courseRootContainer.getRelPath() + File.separator + "layout", null).getBasefile(), exportDirectory, "course export layout folder");
+		// export layout and media folder
+		FileUtils.copyDirToDir(new File(fCourseBase, "layout"), exportDirectory, "course export layout folder");
+		FileUtils.copyDirToDir(new File(fCourseBase, "media"), exportDirectory, "course export media folder");
 		// export course folder
 		FileUtils.copyDirToDir(getIsolatedCourseBaseFolder(), exportDirectory, "course export folder");
 		// export any node data