diff --git a/manifests/c/calibre/calibre/5.8.0/calibre.calibre.installer.yaml b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.installer.yaml
new file mode 100644
index 000000000..b7a2c9c23
--- /dev/null
+++ b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.installer.yaml
@@ -0,0 +1,17 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: calibre.calibre
+PackageVersion: 5.8.0
+Installers:
+- Architecture: x64
+  InstallerUrl: https://download.calibre-ebook.com/5.8.0/calibre-64bit-5.8.0.msi
+  InstallerSha256: BAD737CF71B2858635786FB26F7B6B36D4B3A1977B8C1B59C6BBBA9F8CE1FCA6
+  InstallerType: msi
+  ProductCode: "{719BF2A9-9782-45B8-857D-CCF205B83271}"
+- Architecture: x86
+  InstallerUrl: https://download.calibre-ebook.com/5.8.0/calibre-5.8.0.msi
+  InstallerSha256: 04CA0678C8BB671F71C29D121A787F8BF236B292B9C7DFAC39F5642225A12ABC
+  InstallerType: msi
+  ProductCode: "{6F6B60EE-4915-49B1-B715-353EE0A90879}"
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/c/calibre/calibre/5.8.0/calibre.calibre.locale.en-US.yaml b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.locale.en-US.yaml
new file mode 100644
index 000000000..d68dc8e58
--- /dev/null
+++ b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.locale.en-US.yaml
@@ -0,0 +1,21 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: calibre.calibre
+PackageVersion: 5.8.0
+PackageLocale: en-US
+LicenseUrl: https://github.com/kovidgoyal/calibre/blob/master/LICENSE
+Moniker: calibre
+Tags:
+- ebook
+- calibre
+- kobo
+- kindle
+- epub
+- mobi
+PackageUrl: https://calibre-ebook.com
+Publisher: calibre
+PackageName: calibre
+License: GNU General Public License v3.0
+ShortDescription: calibre is a powerful and easy-to-use e-book manager
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/c/calibre/calibre/5.8.0/calibre.calibre.yaml b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.yaml
index 27a253480..1d51c8ead 100644
--- a/manifests/c/calibre/calibre/5.8.0/calibre.calibre.yaml
+++ b/manifests/c/calibre/calibre/5.8.0/calibre.calibre.yaml
@@ -1,25 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: calibre.calibre
-PackageName: calibre
 PackageVersion: 5.8.0
-Publisher: calibre
-License: GNU General Public License v3.0
-LicenseUrl: https://github.com/kovidgoyal/calibre/blob/master/LICENSE
-Moniker: calibre
-Tags:
-- ebook
-- calibre
-- kobo
-- kindle
-- epub
-- mobi
-ShortDescription: calibre is a powerful and easy-to-use e-book manager
-PackageUrl: https://calibre-ebook.com
-Installers:
-- Architecture: x64
-  InstallerUrl: https://download.calibre-ebook.com/5.8.0/calibre-64bit-5.8.0.msi
-  InstallerSha256: BAD737CF71B2858635786FB26F7B6B36D4B3A1977B8C1B59C6BBBA9F8CE1FCA6
-  InstallerType: msi
-  ProductCode: "{719BF2A9-9782-45B8-857D-CCF205B83271}"
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+