diff --git a/pkg/muon/gen.lua b/pkg/muon/gen.lua
index 04c7cdc5..6a6197ad 100644
--- a/pkg/muon/gen.lua
+++ b/pkg/muon/gen.lua
@@ -18,6 +18,7 @@ end)
 rule('embedder', '$outdir/embedder $args >$out')
 
 local embed = {
+	'commands/clang_format.meson',
 	'commands/copyfile.meson',
 	'commands/coverage.meson',
 	'commands/delete_suffix.meson',
@@ -25,14 +26,18 @@ local embed = {
 	'commands/i18n/itstool.meson',
 	'commands/i18n/msgfmthelper.meson',
 	'commands/vcs_tagger.meson',
+	'html/docs.html',
+	'html/test_out.html',
 	'lib/cmake_prelude.meson',
-	'modules/_test.meson',
 	'modules/gnome.meson',
 	'modules/i18n.meson',
+	'modules/wayland.meson',
+	'modules/windows.meson',
 	'options/global.meson',
 	'options/per_project.meson',
 	'python/python_info.py',
 	'runtime/dependencies.meson',
+	'runtime/toolchains.meson',
 }
 
 local args = {}
@@ -45,7 +50,7 @@ build('embedder', '$outdir/embedded_files.h', {expand{'$srcdir/src/script', embe
 
 build('sed', '$outdir/version.c', '$srcdir/src/version.c.in', {
 	expr={
-		'-e s,@version@,0.5.0,',
+		'-e s,@version@,0.6.0,',
 		'-e s,@vcs_tag@,,',
 		'-e s,@meson_compat@,1.7,',
 	},
@@ -57,34 +62,34 @@ pkg.deps = {
 
 exe('muon', [[
 	src/(
-		args.c cmd_install.c cmd_subprojects.c cmd_test.c
-		coerce.c compilers.c embedded.c
+		arena.c args.c cmd_install.c cmd_subprojects.c 
+		cmd_test.c coerce.c embedded.c
 		error.c guess.c install.c log.c
 		machine_file.c machines.c main.c
 		memmem.c meson_opts.c options.c
-		opts.c rpmvercmp.c sha_256.c
+		opts.c rpmvercmp.c sha_256.c toolchains.c
 		vsenv.c wrap.c ui_null.c
 		backend/(
 			backend.c common_args.c introspect.c ninja.c output.c xcode.c
 			ninja/(
 				alias_target.c coverage.c build_target.c
-				custom_target.c rules.c
+				clang_format.c custom_target.c rules.c
 			)
 		)
 		datastructures/(
-			arr.c bucket_arr.c hash.c stack.c
+			arr.c bucket_arr.c hash.c seg_list.c stack.c
 		)
 		formats/(
-			editorconfig.c ini.c json.c
+			ansi.c editorconfig.c ini.c ini_cfg.c json.c
 			lines.c tap.c xml.c
 		)
 		functions/(
-			array.c boolean.c both_libs.c
+			array.c bool.c both_libs.c
 			build_target.c compiler.c
 			configuration_data.c custom_target.c
 			dependency.c dict.c disabler.c
 			environment.c external_program.c
-			feature_opt.c file.c generator.c
+			feature_opt.c file.c generator.c include_directory.c
 			kernel.c modules.c machine.c meson.c
 			number.c run_result.c
 			source_configuration.c source_set.c
@@ -96,15 +101,15 @@ exe('muon', [[
 			)
 			modules/(
 				curl.c fs.c getopt.c keyval.c pkgconfig.c
-				python.c sourceset.c subprojects.c toolchain.c
-				json.c
+				python.c sourceset.c time.c subprojects.c
+				toolchain.c util.c json.c
 			)
 		)
 		lang/(
-			analyze.c compiler.c eval.c
+			analyze.c compiler.c dap.c docs.c eval.c
 			fmt.c func_lookup.c lexer.c lsp.c
 			object.c object_iterators.c parser.c
-			serial.c string.c typecheck.c
+			serial.c server.c string.c typecheck.c
 			vm.c workspace.c
 		)
 		platform/(
@@ -114,8 +119,9 @@ exe('muon', [[
 				filesystem.c init.c log.c
 				os.c path.c rpath_fixer.c
 				run_cmd.c term.c timer.c
-				uname.c
+				uname.c socket.c
 			)
+			null/(backtrace.c)
 		)
 		external/(
 			libarchive_null.c libcurl_null.c
diff --git a/pkg/muon/src b/pkg/muon/src
index 2a953ce7..1c825e41 160000
--- a/pkg/muon/src
+++ b/pkg/muon/src
@@ -1 +1 @@
-Subproject commit 2a953ce7a16834888965e08160aafcbb2e557b70
+Subproject commit 1c825e41e2266be1bead999f7f65d9c763a7ca18
diff --git a/pkg/muon/ver b/pkg/muon/ver
index 8f0916f7..a918a2aa 100644
--- a/pkg/muon/ver
+++ b/pkg/muon/ver
@@ -1 +1 @@
-0.5.0
+0.6.0
diff --git a/pkg/muon/version.c b/pkg/muon/version.c
index 4f60406c..76e9923d 100644
--- a/pkg/muon/version.c
+++ b/pkg/muon/version.c
@@ -3,7 +3,9 @@
 #include "version.h"
 
 const struct muon_version muon_version = {
-	.version = "0.5.0",
-	.vcs_tag = "2a953ce7",
+	.version = "0.6.0",
+	.vcs_tag = "",
 	.meson_compat = "1.7.99",
+	.platform = "posix",
+	.compiler = "cc",
 };