diff --git a/index/gn/gnat.toml b/index/gn/gnat.toml
index b7ed043a..36e87cfa 100644
--- a/index/gn/gnat.toml
+++ b/index/gn/gnat.toml
@@ -4,11 +4,7 @@ licenses = []
 maintainers = ["alejandro@mosteo.com"]
 maintainers-logins = ["mosteo"]
 
-# Until we rework the native package situation, the intention here is to
-# depend on the native compiler, and not in a particular version. Hence,
-# although versions do not match here, we get the intended result.
-
-[0]
-    [0.origin.'case(distribution)']
-    'debian|ubuntu' = "native:gnat"
-    '...' = ""
+[[external]]
+kind = "output-version"
+version-command = [ "gnat", "--version" ]
+version-regexp = "^GNAT ([\\d\\.]+).*|^GNAT Community ([\\d]{4}).*"
diff --git a/index/ma/make.toml b/index/ma/make.toml
index 2fbce409..d77e54e7 100644
--- a/index/ma/make.toml
+++ b/index/ma/make.toml
@@ -4,8 +4,7 @@ maintainers = ["alejandro@mosteo.com"]
 maintainers-logins = ["mosteo"]
 licenses = []
 
-[0]
-origin = "native:make"
-#    [0.origin.'case(distribution)']
-#    'debian|ubuntu' = "native:make"
-#    '...' = ""
+[[external]]
+kind = "output-version"
+version-command = [ "make", "--version" ]
+version-regexp = ".*Make ([\\d\\.]+).*"