diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 80642bf..3f6c4c4 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -1,5 +1,9 @@
 file(GLOB items *)
 
+set(bshell_interactive 0)
+set(bshell_verbose 0)
+set(bshell_enable_floating_point 0)
+
 foreach(item ${items})
 	if (NOT IS_DIRECTORY ${item})
 		continue()
@@ -7,3 +11,40 @@ foreach(item ${items})
 
 	add_subdirectory(${item})
 endforeach (item)
+
+target_link_libraries(bshell libc libc-runtime libpthread)
+target_link_libraries(bshell.core libc libpthread)
+target_link_libraries(bshell.runtime libc libpthread)
+
+sysroot_add_program(
+	NAME bshell
+	BIN_DIR /usr/bin)
+bsp_add_program(
+	NAME bshell
+	BIN_DIR /usr/bin)
+
+rosetta_wrap_library(
+	NAME bshell.runtime
+	SONAME libbshell.runtime
+	PREFIX lib
+	PUBLIC_INCLUDE_DIRS
+		${CMAKE_CURRENT_SOURCE_DIR}/bshell/bshell.runtime/include)
+rosetta_wrap_library(
+	NAME bshell.core
+	PREFIX lib
+	SONAME libbshell.core)
+
+sysroot_add_library(
+	NAME bshell.runtime
+	HEADER_DIR /usr/include
+	LIB_DIR /usr/lib)
+bsp_add_library(
+	NAME bshell.runtime
+	LIB_DIR /usr/lib)
+
+sysroot_add_library(
+	NAME bshell.core
+	LIB_DIR /usr/lib)
+bsp_add_library(
+	NAME bshell.core
+	LIB_DIR /usr/lib)
diff --git a/programs/bshell b/programs/bshell
index 1a311b3..8843f2d 160000
--- a/programs/bshell
+++ b/programs/bshell
@@ -1 +1 @@
-Subproject commit 1a311b3796dcc66cc9e0cf4a9837cab0513a27fe
+Subproject commit 8843f2d2a9e0f9ac43b5d9ee84312186b2c591ca