diff --git a/swh/loader/package/rpm/loader.py b/swh/loader/package/rpm/loader.py
index 2b93dc2..179d5aa 100644
--- a/swh/loader/package/rpm/loader.py
+++ b/swh/loader/package/rpm/loader.py
@@ -1,19 +1,24 @@
-# Copyright (C) 2019-2021  The Software Heritage developers
+# Copyright (C) 2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from __future__ import annotations
+
 import logging
-from os import path, remove
+from os import path, remove, walk
 import string
 import subprocess
+import tempfile
 from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Tuple
 
 import attr
+from packaging.version import parse as parse_version
 
 from swh.core.tarball import uncompress
 from swh.loader.package.loader import BasePackageInfo, PackageLoader
 from swh.loader.package.utils import EMPTY_AUTHOR
+from swh.model import from_disk
 from swh.model.model import ObjectType, Release, Sha1Git, TimestampWithTimezone
 from swh.storage.interface import StorageInterface
 
@@ -22,28 +27,25 @@ logger = logging.getLogger(__name__)
 
 @attr.s
 class RpmPackageInfo(BasePackageInfo):
-    raw_info = attr.ib(type=Dict[str, Any])
     name = attr.ib(type=str)
     build_time = attr.ib(type=str, default=None)
     """Build time of the package in iso format. (e.g. 2017-02-10T04:59:31+00:00)"""
 
     EXTID_TYPE = "rpm-sha256"
-    MANIFEST_FORMAT = string.Template("$version $url")
+    MANIFEST_FORMAT = string.Template("$name $version $build_time")
 
     @classmethod
-    def from_metadata(
-        cls, a_metadata: Dict[str, Any], origin: str, version: str
-    ) -> "RpmPackageInfo":
+    def from_metadata(cls, a_metadata: Dict[str, Any], version: str) -> RpmPackageInfo:
         filename = a_metadata["url"].split("/")[-1]
         assert filename.endswith(".rpm")
 
         return cls(
+            name=a_metadata["name"],  # nginx
             url=a_metadata["url"],  # url of the .rpm file
             filename=filename,  # nginx-1.18.0-5.fc34.src.rpm
-            version=version,  # 34/Everything/1.18.0
+            version=version,  # 1.18.0-5.fc34
             build_time=a_metadata["buildTime"],
-            raw_info=a_metadata,
-            name=a_metadata["name"],
+            checksums=a_metadata["checksums"],
         )
 
 
@@ -54,7 +56,7 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
         self,
         storage: StorageInterface,
         url: str,
-        packages: Mapping[str, Any],
+        packages: Dict[str, Dict[str, Any]],
         **kwargs: Any,
     ):
         """RPM Loader implementation.
@@ -64,7 +66,7 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
             packages: versioned packages and associated artifacts, example::
 
               {
-                '34/Everything/1.18.0': {
+                '1.18.0-5.fc34': {
                   'name': 'nginx',
                   'version': '1.18.0'
                   'release': 34,
@@ -78,17 +80,20 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
         super().__init__(storage=storage, url=url, **kwargs)
         self.url = url
         self.packages = packages
+        self.tarball_branches: Dict[bytes, Dict[str, Any]] = {}
 
     def get_versions(self) -> Sequence[str]:
-        """Returns the keys of the packages input (e.g. 34/Everything/1.18.0, etc...)"""
-        return list(self.packages)
+        """Returns the keys of the packages input (e.g. 1.18.0-5.fc34, etc...)"""
+        return list(sorted(self.packages, key=parse_version))
+
+    def get_default_version(self) -> str:
+        """Get the newest release version of a rpm package"""
+        return self.get_versions()[-1]
 
     def get_package_info(self, version: str) -> Iterator[Tuple[str, RpmPackageInfo]]:
         yield (
             version,
-            RpmPackageInfo.from_metadata(
-                self.packages[version], self.origin.url, version
-            ),
+            RpmPackageInfo.from_metadata(self.packages[version], version),
         )
 
     def uncompress(
@@ -100,13 +105,43 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
     def build_release(
         self, p_info: RpmPackageInfo, uncompressed_path: str, directory: Sha1Git
     ) -> Optional[Release]:
+
+        # extract tarballs that might be located in the root directory of the rpm
+        # package and adds a dedicated branch for it in the snapshot
+        root, _, files = next(walk(uncompressed_path))
+        for file in files:
+            file_path = path.join(root, file)
+            with tempfile.TemporaryDirectory() as tmpdir:
+                try:
+                    uncompress(file_path, tmpdir)
+                except Exception:
+                    # not a tarball
+                    continue
+
+                tarball_dir = from_disk.Directory.from_disk(
+                    path=tmpdir.encode("utf-8"),
+                    max_content_length=self.max_content_size,
+                )
+
+                contents, skipped_contents, directories = from_disk.iter_directory(
+                    tarball_dir
+                )
+                self.storage.skipped_content_add(skipped_contents)
+                self.storage.content_add(contents)
+                self.storage.directory_add(directories)
+
+                self.tarball_branches[file.encode()] = {
+                    "target_type": "directory",
+                    "target": tarball_dir.hash,
+                }
+
         msg = (
             f"Synthetic release for Rpm source package {p_info.name} "
             f"version {p_info.version}\n"
         )
 
         return Release(
-            name=p_info.name.encode(),
+            name=p_info.version.encode(),
             message=msg.encode(),
             author=EMPTY_AUTHOR,
             date=TimestampWithTimezone.from_iso8601(p_info.build_time),
@@ -115,6 +150,9 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
             synthetic=True,
         )
 
+    def extra_branches(self) -> Dict[bytes, Mapping[str, Any]]:
+        return self.tarball_branches
+
 
 def extract_rpm_package(rpm_path: str, dest: str) -> str:
     """Extracts an RPM package."""

diff --git a/swh/loader/package/rpm/loader.py b/swh/loader/package/rpm/loader.py
index 8b22685..cf30028 100644
--- a/swh/loader/package/rpm/loader.py
+++ b/swh/loader/package/rpm/loader.py
@@ -17,7 +17,7 @@ from packaging.version import parse as parse_version
 
 from swh.core.tarball import uncompress
 from swh.loader.package.loader import BasePackageInfo, PackageLoader
-from swh.loader.package.utils import EMPTY_AUTHOR
+from swh.loader.package.utils import EMPTY_AUTHOR, release_name
 from swh.model import from_disk
 from swh.model.model import ObjectType, Release, Sha1Git, TimestampWithTimezone
 from swh.storage.interface import StorageInterface
@@ -28,11 +28,13 @@ logger = logging.getLogger(__name__)
 @attr.s
 class RpmPackageInfo(BasePackageInfo):
     name = attr.ib(type=str)
+    intrinsic_version = attr.ib(type=str)
+    """Intrinsic version of the package, independent from the distribution it was found"""
     build_time = attr.ib(type=str, default=None)
     """Build time of the package in iso format. (e.g. 2017-02-10T04:59:31+00:00)"""
 
     EXTID_TYPE = "rpm-sha256"
-    MANIFEST_FORMAT = string.Template("$name $version $build_time")
+    MANIFEST_FORMAT = string.Template("$name $intrinsic_version $build_time")
 
     @classmethod
     def from_metadata(cls, a_metadata: Dict[str, Any], version: str) -> RpmPackageInfo:
@@ -43,7 +45,8 @@ class RpmPackageInfo(BasePackageInfo):
             name=a_metadata["name"],  # nginx
             url=a_metadata["url"],  # url of the .rpm file
             filename=filename,  # nginx-1.18.0-5.fc34.src.rpm
-            version=version,  # 1.18.0-5.fc34
+            version=version,  # fedora34/everything/1.18.0-5
+            intrinsic_version=a_metadata["version"],  # 1.18.0-5
             build_time=a_metadata["buildTime"],
             checksums=a_metadata["checksums"],
         )
@@ -66,9 +69,9 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
             packages: versioned packages and associated artifacts, example::
 
               {
-                '1.18.0-5.fc34': {
+                'fedora34/everything/1.18.0-5': {
                   'name': 'nginx',
-                  'version': '1.18.0'
+                  'version': '1.18.0-5'
                   'release': 34,
                   'edition': 'Everything',
                   'buildTime': '2022-11-01T12:00:55+00:00',
@@ -87,7 +90,7 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
         self.tarball_branches: Dict[bytes, Mapping[str, Any]] = {}
 
     def get_versions(self) -> Sequence[str]:
-        """Returns the keys of the packages input (e.g. 1.18.0-5.fc34, etc...)"""
+        """Returns the keys of the packages input (e.g. fedora34/everything/1.18.0-5, etc...)"""
         return list(sorted(self.packages, key=parse_version))
 
     def get_default_version(self) -> str:
@@ -95,7 +98,10 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
         return self.get_versions()[-1]
 
     def get_package_info(self, version: str) -> Iterator[Tuple[str, RpmPackageInfo]]:
-        yield (version, RpmPackageInfo.from_metadata(self.packages[version], version))
+        yield (
+            release_name(version),
+            RpmPackageInfo.from_metadata(self.packages[version], version),
+        )
 
     def uncompress(
         self, dl_artifacts: List[Tuple[str, Mapping[str, Any]]], dest: str
@@ -141,7 +147,7 @@ class RpmLoader(PackageLoader[RpmPackageInfo]):
         )
 
         return Release(
-            name=p_info.version.encode(),
+            name=p_info.intrinsic_version.encode(),
             message=msg.encode(),
             author=EMPTY_AUTHOR,
             date=TimestampWithTimezone.from_iso8601(p_info.build_time),