diff --git a/builder/builder-main.c b/builder/builder-main.c
index 8788be6c..d838fb6a 100644
--- a/builder/builder-main.c
+++ b/builder/builder-main.c
@@ -143,6 +143,42 @@ usage (GOptionContext *context, const char *message)
 
 static const char skip_arg[] = "skip";
 
+static gboolean
+bundle_manifest (BuilderContext *build_context,
+                 GFile          *manifest_file,
+                 GError        **error)
+{
+  g_autoptr(GFile) sources_dir = NULL;
+  g_autoptr(GFile) destination_file = NULL;
+  g_autofree char *sources_dir_path = NULL;
+  g_autofree char *file_name = NULL;
+  g_autofree char *destination_file_path = NULL;
+  g_autofree char *app_dir_path = g_file_get_path (builder_context_get_app_dir (build_context));
+
+  sources_dir_path = g_build_filename (app_dir_path,
+                                       "sources",
+                                       NULL);
+  sources_dir = g_file_new_for_path (sources_dir_path);
+  if (!g_file_query_exists (sources_dir, NULL) &&
+      !g_file_make_directory_with_parents (sources_dir, NULL, error))
+    return FALSE;
+
+  file_name = g_file_get_basename (manifest_file);
+  destination_file_path = g_build_filename (sources_dir_path,
+                                            file_name,
+                                            NULL);
+  destination_file = g_file_new_for_path (destination_file_path);
+
+  if (!g_file_copy (manifest_file, destination_file,
+                    G_FILE_COPY_OVERWRITE,
+                    NULL,
+                    NULL, NULL,
+                    error))
+    return FALSE;
+
+  return TRUE;
+}
+
 static gboolean
 do_export (BuilderContext *build_context,
            GError        **error,
@@ -673,6 +709,12 @@ main (int    argc,
           g_autofree char *sources_id = builder_manifest_get_sources_id (manifest);
           g_print ("Exporting %s to repo\n", sources_id);
 
+          if (!bundle_manifest (build_context, manifest_file, &error))
+            {
+              g_printerr ("Can't bundle manifest file '%s' : %s\n", manifest_rel_path, error->message);
+              return 1;
+            }
+
           if (!do_export (build_context, &error, TRUE,
                           "--metadata=metadata.sources",
                           "--files=sources",