diff --git a/src/ClaudeMailbox/ClaudeMailbox.csproj b/src/ClaudeMailbox/ClaudeMailbox.csproj
index 2b10826..7bacf8b 100644
--- a/src/ClaudeMailbox/ClaudeMailbox.csproj
+++ b/src/ClaudeMailbox/ClaudeMailbox.csproj
@@ -15,6 +15,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
     <PackageReference Include="ModelContextProtocol" Version="1.2.0" />
     <PackageReference Include="ModelContextProtocol.AspNetCore" Version="1.2.0" />
   </ItemGroup>
diff --git a/src/ClaudeMailbox/ServerHost.cs b/src/ClaudeMailbox/ServerHost.cs
index a9755e3..c9a5ced 100644
--- a/src/ClaudeMailbox/ServerHost.cs
+++ b/src/ClaudeMailbox/ServerHost.cs
@@ -4,6 +4,7 @@ using ClaudeMailbox.Data.Repositories;
 using ClaudeMailbox.Http;
 using ClaudeMailbox.Mcp;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting.WindowsServices;
 
 namespace ClaudeMailbox;
 
@@ -12,6 +13,7 @@ public static class ServerHost
     public static WebApplicationBuilder CreateBuilder(DaemonConfig cfg, string[]? args = null)
     {
         var builder = WebApplication.CreateBuilder(args ?? Array.Empty<string>());
+        builder.Host.UseWindowsService(opt => opt.ServiceName = "ClaudeMailbox");
 
         builder.Services.AddSingleton(cfg);
         builder.Services.AddHttpContextAccessor();