diff --git a/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp b/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
index 1c3bca1a..bf721058 100644
--- a/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
+++ b/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
@@ -144,6 +144,11 @@ namespace ams::impl {
 
     AMS_DEFINE_SYSTEM_THREAD(10, tma, BridgePcieDriver);
 
+    /* DevServer/TioServer. */
+    AMS_DEFINE_SYSTEM_THREAD(21, TioServer, Main);
+    AMS_DEFINE_SYSTEM_THREAD(21, TioServer, FileServerHtcsServer);
+    AMS_DEFINE_SYSTEM_THREAD(21, TioServer, SdCardObserver);
+
 
     #undef AMS_DEFINE_SYSTEM_THREAD
 
diff --git a/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp b/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
index 894c556f..f8028b07 100644
--- a/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
+++ b/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
@@ -101,6 +101,7 @@ namespace ams::ncm {
 
         static const SystemProgramId Manu;
         static const SystemProgramId Htc;
+        static const SystemProgramId DevServer;
     };
 
     struct AtmosphereProgramId {
@@ -202,6 +203,7 @@ namespace ams::ncm {
 
     inline constexpr const SystemProgramId SystemProgramId::Manu        = { 0x010000000000B14Aul };
     inline constexpr const SystemProgramId SystemProgramId::Htc         = { 0x010000000000B240ul };
+    inline constexpr const SystemProgramId SystemProgramId::DevServer   = { 0x010000000000D623ul };
 
     inline constexpr bool IsSystemProgramId(const ProgramId &program_id) {
         return (SystemProgramId::Start <= program_id && program_id <= SystemProgramId::End) || IsAtmosphereProgramId(program_id);