diff --git a/builder/builder-main.c b/builder/builder-main.c
index ee6722f86..5571948d3 100644
--- a/builder/builder-main.c
+++ b/builder/builder-main.c
@@ -676,7 +676,7 @@ main (int    argc,
 
           if (!do_export (build_context, &error, TRUE,
                           "--metadata=metadata.sources",
-                          builder_context_get_build_runtime (build_context) ? "--files=usr/sources" : "--files=sources",
+                          "--files=sources",
                           opt_repo, app_dir_path, builder_manifest_get_branch (manifest, opt_default_branch), NULL))
             {
               g_printerr ("Export failed: %s\n", error->message);
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index 6081b7440..0d361d270 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -2193,14 +2193,13 @@ builder_manifest_finish (BuilderManifest *self,
         {
           debuginfo_dir = g_file_resolve_relative_path (app_dir, "usr/lib/debug");
           locale_parent_dir = g_file_resolve_relative_path (app_dir, "usr/" LOCALES_SEPARATE_DIR);
-          sources_dir = g_file_resolve_relative_path (app_dir, "usr/sources");
         }
       else
         {
           debuginfo_dir = g_file_resolve_relative_path (app_dir, "files/lib/debug");
           locale_parent_dir = g_file_resolve_relative_path (app_dir, "files/" LOCALES_SEPARATE_DIR);
-          sources_dir = g_file_resolve_relative_path (app_dir, "sources");
         }
+      sources_dir = g_file_resolve_relative_path (app_dir, "sources");
 
       if (self->separate_locales && g_file_query_exists (locale_parent_dir, NULL))
         {