diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index cfa2728d..cf69d6bf 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -177,13 +177,16 @@ cat > wix.xml << EOF
         SourceFile="${PKGMSMNAME}" />
     </Directory>
 
-    <Feature Id="Complete" Level="1">
-      <MergeRef Id="Wintun" />
+    <Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1">
       <ComponentRef Id="MainExecutable" />
       <ComponentRef Id="CtrlExecutable" />
       <ComponentRef Id="ConfigScript" />
     </Feature>
 
+    <Feature Id="WintunFeature" Title="Wintun" Level="1">
+      <MergeRef Id="Wintun" />
+    </Feature>
+
     <CustomAction
       Id="UpdateGenerateConfig"
       Directory="YggdrasilInstallFolder"