diff --git a/repo_data/components.xml b/repo_data/components.xml
index a24bd8f8d1..e8c6f866cb 100644
--- a/repo_data/components.xml
+++ b/repo_data/components.xml
@@ -554,7 +554,7 @@
 
 		<Component>
 			<Name>security.crypto</Name>
-			<LocalName xml:lang="en">Cryptographic utilitiess</LocalName>
+			<LocalName xml:lang="en">Cryptographic utilities</LocalName>
 			<Summary xml:lang="en">Cryptographic utilities and runtimes</Summary>
 			<Description xml:lang="en">Cryptographic utilities and runtimes</Description>
 			<Group>security</Group>
@@ -562,6 +562,42 @@
 				<Name>Solus Team</Name>
 				<Email>root@solus-project.com</Email>
 			</Maintainer>
-		</Component>																				
+		</Component>
+
+		<Component>
+			<Name>gaming</Name>
+			<LocalName xml:lang="en">Main games collection</LocalName>
+			<Summary xml:lang="en">Main games</Summary>
+			<Description xml:lang="en">Main games</Description>
+			<Group>gaming</Group>
+			<Maintainer>
+				<Name>Solus Team</Name>
+				<Email>root@solus-project.com</Email>
+			</Maintainer>
+		</Component>
+
+		<Component>
+			<Name>desktop.games</Name>
+			<LocalName xml:lang="en">Desktop focused games</LocalName>
+			<Summary xml:lang="en">Desktop focused games</Summary>
+			<Description xml:lang="en">Desktop focused games</Description>
+			<Group>gaming</Group>
+			<Maintainer>
+				<Name>Solus Team</Name>
+				<Email>root@solus-project.com</Email>
+			</Maintainer>
+		</Component>
+
+		<Component>
+			<Name>games.arcade</Name>
+			<LocalName xml:lang="en">Arcade Games</LocalName>
+			<Summary xml:lang="en">Arcade Games</Summary>
+			<Description xml:lang="en">Arcade Games</Description>
+			<Group>gaming</Group>
+			<Maintainer>
+				<Name>Solus Team</Name>
+				<Email>root@solus-project.com</Email>
+			</Maintainer>
+		</Component>	
 	</Components>
 </PISI>
diff --git a/repo_data/groups.xml b/repo_data/groups.xml
index c77502b63b..6e111f0d0a 100644
--- a/repo_data/groups.xml
+++ b/repo_data/groups.xml
@@ -18,6 +18,12 @@
 			<Icon>multimedia-volume-control</Icon>
 		</Group>
 
+		<Group>
+			<Name>gaming</Name>
+			<LocalName xml:lang="en">Gaming</LocalName>
+			<Icon>input-gaming</Icon>
+		</Group>
+
 		<Group>
 			<Name>office</Name>
 			<LocalName xml:lang="en">Office</LocalName>