diff --git a/pungi/wrappers/comps.py b/pungi/wrappers/comps.py
index 506fcfe3..796688d9 100644
--- a/pungi/wrappers/comps.py
+++ b/pungi/wrappers/comps.py
@@ -261,7 +261,7 @@ class CompsWrapper(object):
lang_node = doc.createElement("langpacks")
msg_elem.appendChild(lang_node)
- for langpack in langpacks:
+ for langpack in sorted(langpacks, key=lambda x: x['name']):
match_node = doc.createElement("match")
match_node.setAttribute("name", langpack["name"])
match_node.setAttribute("install", langpack["install"])
diff --git a/tests/fixtures/comps-env.xml b/tests/fixtures/comps-env.xml
index d8a0490f..169bd066 100644
--- a/tests/fixtures/comps-env.xml
+++ b/tests/fixtures/comps-env.xml
@@ -104,6 +104,7 @@
+
@@ -120,6 +121,5 @@
-
diff --git a/tests/fixtures/comps-formatted.xml b/tests/fixtures/comps-formatted.xml
index 510acff6..cbce574d 100644
--- a/tests/fixtures/comps-formatted.xml
+++ b/tests/fixtures/comps-formatted.xml
@@ -118,6 +118,7 @@
+
@@ -134,6 +135,5 @@
-
diff --git a/tests/fixtures/comps-group.xml b/tests/fixtures/comps-group.xml
index ebf2207d..78b5be26 100644
--- a/tests/fixtures/comps-group.xml
+++ b/tests/fixtures/comps-group.xml
@@ -84,6 +84,7 @@
+
@@ -100,6 +101,5 @@
-