Merge branch 'feature/non-free-firmware' into 'main'

Support transition to new non-free-firmware component

See merge request apt-team/apt!282

27 files changed, 677 insertions, 543 deletions

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index aacb78bba..ea10d10ad 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -222,6 +222,8 @@ int pkgCdrom::Score(string Path)
       Res += 20;
    if (Path.find("/non-free/") != string::npos)
       Res += 20;
+   if (Path.find("/non-free-firmware/") != string::npos)
+      Res += 20;
    if (Path.find("/non-US/") != string::npos)
       Res += 20;
    if (Path.find("/source/") != string::npos)
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index bc5843153..b19d180a4 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -67,24 +67,38 @@ class DefaultRootSetFunc2 : public pkgDepCache::DefaultRootSetFunc
 
 									/*}}}*/
 // helper for Install-Recommends-Sections and Never-MarkAuto-Sections	/*{{{*/
-static bool 
-ConfigValueInSubTree(const char* SubTree, const char *needle)
+// FIXME: Has verbatim copy in cmdline/apt-mark.cc
+static bool ConfigValueInSubTree(const char* SubTree, std::string_view const needle)
 {
-   Configuration::Item const *Opts;
-   Opts = _config->Tree(SubTree);
-   if (Opts != 0 && Opts->Child != 0)
+   if (needle.empty())
+      return false;
+   Configuration::Item const *Opts = _config->Tree(SubTree);
+   if (Opts != nullptr && Opts->Child != nullptr)
    {
       Opts = Opts->Child;
-      for (; Opts != 0; Opts = Opts->Next)
+      for (; Opts != nullptr; Opts = Opts->Next)
       {
-	 if (Opts->Value.empty() == true)
+	 if (Opts->Value.empty())
 	    continue;
-	 if (strcmp(needle, Opts->Value.c_str()) == 0)
+	 if (needle == Opts->Value)
 	    return true;
       }
    }
    return false;
 }
+static bool SectionInSubTree(char const * const SubTree, std::string_view Needle)
+{
+   if (ConfigValueInSubTree(SubTree, Needle))
+      return true;
+   auto const sub = Needle.find('/');
+   if (sub == std::string_view::npos)
+   {
+      std::string special{"<undefined>/"};
+      special.append(Needle);
+      return ConfigValueInSubTree(SubTree, special);
+   }
+   return ConfigValueInSubTree(SubTree, Needle.substr(sub + 1));
+}
 									/*}}}*/
 pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :		/*{{{*/
   d(NULL), cache(cache), released(false)
@@ -1050,7 +1064,7 @@ bool pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
 	 // We do not check for or-groups here as we don't know which package takes care of
 	 // providing the feature the user likes e.g.:  browser1 | browser2 | browser3
 	 // Temporary removals are effected by this as well, which is bad, but unlikely in practice
-	 bool const PinNeverMarkAutoSection = (PV->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", PV.Section()));
+	 bool const PinNeverMarkAutoSection = (PV->Section != 0 && SectionInSubTree("APT::Never-MarkAuto-Sections", PV.Section()));
 	 if (PinNeverMarkAutoSection)
 	 {
 	    for (DepIterator D = PV.DependsList(); D.end() != true; ++D)
@@ -1761,8 +1775,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg, bool AutoInst,
       VerIterator const CurVer = Pkg.CurrentVer();
       if (not CurVer.end() && CurVer->Section != 0 && strcmp(CurVer.Section(), PV.Section()) != 0)
       {
-	 bool const CurVerInMoveSection = ConfigValueInSubTree("APT::Move-Autobit-Sections", CurVer.Section());
-	 bool const InstVerInMoveSection = ConfigValueInSubTree("APT::Move-Autobit-Sections", PV.Section());
+	 bool const CurVerInMoveSection = SectionInSubTree("APT::Move-Autobit-Sections", CurVer.Section());
+	 bool const InstVerInMoveSection = SectionInSubTree("APT::Move-Autobit-Sections", PV.Section());
 	 return (not CurVerInMoveSection && InstVerInMoveSection);
       }
       return false;
@@ -2254,7 +2268,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) const
       // FIXME: this is a meant as a temporary solution until the
       //        recommends are cleaned up
       const char *sec = Dep.ParentVer().Section();
-      if (sec && ConfigValueInSubTree("APT::Install-Recommends-Sections", sec))
+      if (sec && SectionInSubTree("APT::Install-Recommends-Sections", sec))
 	 return true;
    }
    else if(Dep->Type == pkgCache::Dep::Suggests)
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index affae655d..f1734fea2 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -21,13 +21,32 @@
 
 #include <ostream>
 #include <string>
+#include <tuple>
 
 #include <apti18n.h>
 									/*}}}*/
 
 // DoUpdate - Update the package lists					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
+static bool isDebianBookwormRelease(pkgCache::RlsFileIterator const &RlsFile)
+{
+   std::tuple<std::string_view, std::string_view, std::string_view> const affected[] = {
+      {"Debian", "Debian", "bookworm"},
+      {"Debian", "Debian", "sid"},
+   };
+   if (RlsFile.end() || RlsFile->Origin == nullptr || RlsFile->Label == nullptr || RlsFile->Codename == nullptr)
+      return false;
+   std::tuple<std::string_view, std::string_view, std::string_view> const release{RlsFile.Origin(), RlsFile.Label(), RlsFile.Codename()};
+   return std::find(std::begin(affected), std::end(affected), release) != std::end(affected);
+}
+static void suggestDebianNonFreeFirmware(char const *const repo, char const *const val,
+					 char const *const from, char const *const to)
+{
+   // Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
+   _error->Notice(_("Repository '%s' changed its '%s' value from '%s' to '%s'"), repo, val, from, to);
+   std::string notes;
+   strprintf(notes, "https://www.debian.org/releases/bookworm/%s/release-notes/ch-information.html#non-free-split", _config->Find("APT::Architecture").c_str());
+   _error->Notice(_("More information about this can be found online in the Release notes at: %s"), notes.c_str());
+}
 bool DoUpdate(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 1)
@@ -81,44 +100,135 @@ bool DoUpdate(CommandLine &CmdL)
    if (Cache.BuildCaches(false) == false)
       return false;
 
-   if (_config->FindB("APT::Get::Update::SourceListWarnings", true))
-   {
+   bool const SLWarnings = _config->FindB("APT::Get::Update::SourceListWarnings", true);
+   if (SLWarnings)
       List = Cache.GetSourceList();
-      for (pkgSourceList::const_iterator S = List->begin(); S != List->end(); ++S)
-      {
-	 if (APT::String::Startswith((*S)->GetURI(), "ftp://") == false)
-	    continue;
-	 pkgCache::RlsFileIterator const RlsFile = (*S)->FindInCache(Cache, false);
-	 if (RlsFile.end() || RlsFile->Origin == 0 || RlsFile->Label == 0)
-	    continue;
-	 char const *const affected[][2] = {
-	     {"Debian", "Debian"},
-	     {"Debian", "Debian-Security"},
-	     {"Debian Backports", "Debian Backports"},
-	 };
-	 auto const matchRelease = [&](decltype(affected[0]) a) {
-	    return strcmp(RlsFile.Origin(), a[0]) == 0 && strcmp(RlsFile.Label(), a[1]) == 0;
-	 };
-	 if (std::find_if(std::begin(affected), std::end(affected), matchRelease) != std::end(affected))
-	    _error->Warning("Debian shuts down public FTP services currently still used in your sources.list(5) as '%s'.\n"
-			    "See press release %s for details.",
-			    (*S)->GetURI().c_str(), "https://debian.org/News/2017/20170425");
-      }
-      for (pkgSourceList::const_iterator S = List->begin(); S != List->end(); ++S)
+
+   if (_config->FindB("APT::Get::Update::SourceListWarnings::APTAuth", SLWarnings))
+   {
+      constexpr std::string_view const affected_method[] = {"http", "https", "tor+http", "tor+https", "ftp"};
+      for (auto *S : *List)
       {
-	 URI uri((*S)->GetURI());
+	 URI uri(S->GetURI());
 	 if (uri.User.empty() && uri.Password.empty())
 	    continue;
 	 // we can't really predict if a +http method supports everything http does,
 	 // so we play it safe and use an allowlist here.
-	 char const *const affected[] = {"http", "https", "tor+http", "tor+https", "ftp"};
-	 if (std::find(std::begin(affected), std::end(affected), uri.Access) != std::end(affected))
+	 if (std::find(std::begin(affected_method), std::end(affected_method), uri.Access) != std::end(affected_method))
 	    // TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
 	    _error->Notice(_("Usage of %s should be preferred over embedding login information directly in the %s entry for '%s'"),
 			   "apt_auth.conf(5)", "sources.list(5)", URI::ArchiveOnly(uri).c_str());
       }
    }
 
+   if (_config->FindB("APT::Get::Update::SourceListWarnings::NonFreeFirmware", SLWarnings))
+   {
+      // If a Debian source has a non-free component, suggest adding non-free-firmware
+      bool found_affected_release = false;
+      bool found_non_free = false;
+      bool found_non_free_firmware = false;
+      for (auto *S : *List)
+      {
+	 if (not isDebianBookwormRelease(S->FindInCache(Cache, false)))
+	    continue;
+
+	 for (auto PkgFile = Cache.GetPkgCache()->FileBegin(); not PkgFile.end(); ++PkgFile)
+	 {
+	    if (PkgFile.Flagged(pkgCache::Flag::NoPackages))
+	       continue;
+	    found_affected_release = true;
+	    const auto * const comp = PkgFile.Component();
+	    if (comp == nullptr)
+	      continue;
+	    if (strcmp(comp, "non-free") == 0)
+	       found_non_free = true;
+	    else if (strcmp(comp, "non-free-firmware") == 0)
+	    {
+	       found_non_free_firmware = true;
+	       break;
+	    }
+	 }
+	 if (found_non_free_firmware)
+	    break;
+      }
+      if (not found_non_free_firmware && found_non_free && found_affected_release)
+      {
+	 /* See if a well-known firmware package is installable from this codename
+	    if so, we likely operate with new apt on an old snapshot not supporting non-free-firmware */
+	 bool suggest_non_free_firmware = true;
+	 if (auto const Grp = Cache.GetPkgCache()->FindGrp("firmware-linux-nonfree"); not Grp.end())
+	 {
+	    for (auto Pkg = Grp.PackageList(); not Pkg.end() && suggest_non_free_firmware; Pkg = Grp.NextPkg(Pkg))
+	    {
+	       for (auto Ver = Pkg.VersionList(); not Ver.end(); ++Ver)
+	       {
+		  if (not Ver.Downloadable())
+		     continue;
+		  for (auto VerFile = Ver.FileList(); not VerFile.end(); ++VerFile)
+		  {
+		     auto const PkgFile = VerFile.File();
+		     if (PkgFile.end())
+			continue;
+		     if (not isDebianBookwormRelease(PkgFile.ReleaseFile()))
+			continue;
+		     suggest_non_free_firmware = false;
+		     break;
+		  }
+		  if (not suggest_non_free_firmware)
+		     break;
+	       }
+	    }
+	 }
+	 if (suggest_non_free_firmware)
+	    suggestDebianNonFreeFirmware("Debian bookworm", "non-free component", "non-free", "non-free non-free-firmware");
+      }
+
+      if (not found_non_free_firmware && not found_non_free && found_affected_release)
+      {
+	 /* Try to notify users who have installed firmware packages at some point, but
+	    have not enabled non-free currently – they might want to opt into updates now */
+	 APT::StringView const affected_pkgs[] = {
+	    "amd64-microcode", "atmel-firmware", "bluez-firmware", "dahdi-firmware-nonfree",
+	    "firmware-amd-graphics", "firmware-ast", "firmware-atheros", "firmware-bnx2",
+	    "firmware-bnx2x", "firmware-brcm80211", "firmware-cavium", "firmware-intel-sound",
+	    "firmware-intelwimax", "firmware-ipw2x00", "firmware-ivtv", "firmware-iwlwifi",
+	    "firmware-libertas", "firmware-linux", "firmware-linux-nonfree", "firmware-misc-nonfree",
+	    "firmware-myricom", "firmware-netronome", "firmware-netxen", "firmware-qcom-media",
+	    "firmware-qcom-soc", "firmware-qlogic", "firmware-realtek", "firmware-realtek-rtl8723cs-bt",
+	    "firmware-samsung", "firmware-siano", "firmware-sof-signed", "firmware-ti-connectivity",
+	    "firmware-zd1211", "intel-microcode", "midisport-firmware", "raspi-firmware",
+	 };
+	 bool suggest_non_free_firmware = false;
+	 for (auto pkgname : affected_pkgs)
+	 {
+	    auto const Grp = Cache.GetPkgCache()->FindGrp(pkgname);
+	    if (Grp.end())
+	       continue;
+	    for (auto Pkg = Grp.PackageList(); not Pkg.end(); Pkg = Grp.NextPkg(Pkg))
+	    {
+	       auto const Ver = Pkg.CurrentVer();
+	       if (Ver.end() || Ver.Downloadable())
+		  continue;
+	       bool another = false;
+	       for (auto V = Pkg.VersionList(); not V.end(); ++V)
+		  if (V.Downloadable())
+		  {
+		     another = true;
+		     break;
+		  }
+	       if (another)
+		  continue;
+	       suggest_non_free_firmware = true;
+	       break;
+	    }
+	    if (suggest_non_free_firmware)
+	       break;
+	 }
+	 if (suggest_non_free_firmware)
+	    suggestDebianNonFreeFirmware("Debian bookworm", "firmware component", "non-free", "non-free-firmware");
+      }
+   }
+
    // show basic stats (if the user whishes)
    if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true)
    {
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 5eaed2c71..46d3ca5b8 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -140,25 +140,38 @@ static bool DoMarkAuto(CommandLine &CmdL)
 }
 									/*}}}*/
 // helper for Install-Recommends-Sections and Never-MarkAuto-Sections	/*{{{*/
-static bool
-ConfigValueInSubTree(const char *SubTree, const char *needle)
+// FIXME: Copied verbatim from apt-pkg/depcache.cc
+static bool ConfigValueInSubTree(const char* SubTree, std::string_view const needle)
 {
-   // copied from depcache.cc
-   Configuration::Item const *Opts;
-   Opts = _config->Tree(SubTree);
-   if (Opts != 0 && Opts->Child != 0)
+   if (needle.empty())
+      return false;
+   Configuration::Item const *Opts = _config->Tree(SubTree);
+   if (Opts != nullptr && Opts->Child != nullptr)
    {
       Opts = Opts->Child;
-      for (; Opts != 0; Opts = Opts->Next)
+      for (; Opts != nullptr; Opts = Opts->Next)
       {
-	 if (Opts->Value.empty() == true)
+	 if (Opts->Value.empty())
 	    continue;
-	 if (strcmp(needle, Opts->Value.c_str()) == 0)
+	 if (needle == Opts->Value)
 	    return true;
       }
    }
    return false;
 }
+static bool SectionInSubTree(char const * const SubTree, std::string_view Needle)
+{
+   if (ConfigValueInSubTree(SubTree, Needle))
+      return true;
+   auto const sub = Needle.find('/');
+   if (sub == std::string_view::npos)
+   {
+      std::string special{"<undefined>/"};
+      special.append(Needle);
+      return ConfigValueInSubTree(SubTree, special);
+   }
+   return ConfigValueInSubTree(SubTree, Needle.substr(sub + 1));
+}
 									/*}}}*/
 /* DoMinimize - minimize manually installed	{{{*/
 /* Traverses dependencies of meta packages and marks them as manually
@@ -179,7 +192,7 @@ static bool DoMinimize(CommandLine &CmdL)
       auto ver = pkg.CurrentVer();
       return ver.end() == false && ((*DepCache)[pkg].Flags & pkgCache::Flag::Auto) == 0 &&
 	     ver->Section != 0 &&
-	     ConfigValueInSubTree("APT::Never-MarkAuto-Sections", ver.Section());
+	     SectionInSubTree("APT::Never-MarkAuto-Sections", ver.Section());
    };
 
    APT::PackageSet roots;
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 90ee8908b..10438e848 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -22,23 +22,11 @@ APT
   Never-MarkAuto-Sections
   {
 	"metapackages";
-	"contrib/metapackages";
-	"non-free/metapackages";
-	"restricted/metapackages";
-	"universe/metapackages";
-	"multiverse/metapackages";
 	"tasks";
-	"contrib/tasks";
-	"non-free/tasks";
   };
 
   Move-Autobit-Sections
   {
 	"oldlibs";
-	"contrib/oldlibs";
-	"non-free/oldlibs";
-	"restricted/oldlibs";
-	"universe/oldlibs";
-	"multiverse/oldlibs";
   };
 };
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 25ca5e129..6c2982f0c 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -369,7 +369,7 @@ for i in Sections do
       <listitem><para>
       This is a space separated list of sections which appear 
       under the distribution; typically this is something like 
-      <literal>main contrib non-free</literal></para></listitem>
+      <literal>main contrib non-free non-free-firmware</literal></para></listitem>
       </varlistentry>
       
       <varlistentry><term><option>Architectures</option></term>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index db5e18d28..60f522826 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -277,17 +277,17 @@
 <!ENTITY apt-product-version "2.5.6">
 
 <!-- (Code)names for various things used all over the place -->
-<!ENTITY debian-oldstable-codename "buster">
-<!ENTITY debian-stable-codename "bullseye">
-<!ENTITY debian-testing-codename "bookworm">
-<!ENTITY debian-stable-version "11">
-<!ENTITY ubuntu-codename "hirsute">
+<!ENTITY debian-oldstable-codename "bullseye">
+<!ENTITY debian-stable-codename "bookworm">
+<!ENTITY debian-testing-codename "trixie">
+<!ENTITY debian-stable-version "12">
+<!ENTITY ubuntu-codename "jammy">
 
 <!-- good and bad just refers to matching and not matching a pattern…
      It is not a remark about the specific perl version.
      There is no way perl could be classified "good" (or "bad") in any version… -->
-<!ENTITY good-perl "5.20">
-<!ENTITY bad-perl "5.24">
+<!ENTITY good-perl "5.32">
+<!ENTITY bad-perl "5.36">
 
 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 0e8bcb2ce..f3897ed40 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -38,6 +38,13 @@ BinDirectory "pool/non-free" {
 	Contents "dists/sid/non-free/Contents-i386";
 };
 
+// And this is (you guessed it) the same for the non-free-firmware section
+BinDirectory "pool/non-free-firmware" {
+	Packages "dists/sid/non-free-firmware/binary-i386/Packages";
+	Sources "dists/sid/non-free-firmware/source/Sources";
+	Contents "dists/sid/non-free-firmware/Contents-i386";
+};
+
 // By default all Packages should have the extension ".deb"
 Default {
 	Packages {
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b3deccaaf..beafbbcd4 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -123,7 +123,11 @@ APT
      Update
      {
         InteractiveReleaseInfoChanges "<BOOL>";
-        SourceListWarnings "<BOOL>";
+        SourceListWarnings "<BOOL>"
+        {
+           APTAuth "<BOOL>";
+           NonFreeFirmware "<BOOL>";
+        };
      };
   };
 
diff --git a/doc/guide.dbk b/doc/guide.dbk
index ab4b0c6d0..d2f650a20 100644
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -252,9 +252,9 @@ packages into the US is legal however.
 </para>
 <screen>
  Please give the components to get
- The components are typically something like: main contrib non-free
+ The components are typically something like: main contrib non-free non-free-firmware
 
- Components [main contrib non-free]:
+ Components [main contrib non-free non-free-firmware]:
 </screen>
 <para>
 The components list refers to the list of sub distributions to fetch. The
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index dbba135fd..fb4980853 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5641,11 +5641,11 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or "
 "<literal>&debian-testing-codename;</literal> while component is one of "
-"<literal>main</literal>, <literal>contrib</literal> or "
-"<literal>non-free</literal>. The <literal>deb-src</literal> type references "
-"a Debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"<literal>main</literal>, <literal>contrib</literal>, "
+"<literal>non-free</literal> or <literal>non-free-firmware</literal>. The "
+"<literal>deb-src</literal> type references a Debian distribution's source "
+"code in the same form as the <literal>deb</literal> type.  A "
+"<literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5880,7 +5880,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -6143,13 +6143,13 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6159,7 +6159,7 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6170,7 +6170,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6180,7 +6180,7 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6191,7 +6191,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid ""
+"deb-src file:/home/apt/debian unstable main contrib non-free "
+"non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6201,7 +6203,7 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6892,7 +6894,7 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib "
-"non-free</literal>"
+"non-free non-free-firmware</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -9066,9 +9068,10 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free "
+"non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index cca462001..5073e2519 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -8064,10 +8064,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
 "Archiv, <filename>Distribution/Bestandteil</filename>. "
@@ -8075,11 +8075,11 @@ msgstr ""
 "<literal>stable</literal> oder <literal>testing</literal> oder ein Codename "
 "wie <literal>&debian-stable-codename;</literal> oder <literal>&debian-"
 "testing-codename;</literal> während Bestandteil entweder <literal>main</"
-"literal>, <literal>contrib</literal> oder <literal>non-free</literal> ist. "
-"Der <literal>deb-src</literal>-Typ beschreibt den Quellcode einer Debian-"
-"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine "
-"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes "
-"herunterzuladen."
+"literal>, <literal>contrib</literal>, <literal>non-free</literal> oder "
+"<literal>non-free-firmware</literal> ist. Der <literal>deb-src</literal>-Typ "
+"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
+"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
+"benötigt, um Quellindizes herunterzuladen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8436,7 +8436,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8853,16 +8853,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/"
-"apt/debian für stable/main, stable/contrib und stable/non-free."
+"apt/debian für stable/main, stable/contrib, stable/non-free und stable/non-"
+"free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8871,12 +8872,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8887,8 +8888,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8897,12 +8898,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8912,8 +8913,8 @@ msgstr "Quellenangabe für Obiges"
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8922,12 +8923,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9880,11 +9881,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Dies ist eine durch Leerzeichen getrennte Liste der Abschnitte, die unter "
 "der Distribution erscheint, typischerweise etwas wie <literal>main contrib "
-"non-free</literal>"
+"non-free non-free-firmware</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -11876,10 +11877,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?name(REGEX)</code>"
 msgid "<code>?codename(REGEX)</code>"
-msgstr "<code>?name(REGULÄRER_AUSDRUCK)</code>"
+msgstr "<code>?codename(REGULÄRER_AUSDRUCK)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
@@ -12040,115 +12039,83 @@ msgstr "Diese Muster wählen bestimmte Versionen eines Pakets aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?depends(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?depends(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DPATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DMUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?pre-depends(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?pre-depends(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DPre-Depends:PATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DPre-Depends:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?suggests(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?suggests(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DSuggests:PATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DSuggests:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?conflicts(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?conflicts(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>~DConflicts:PATTERN</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>~DConflicts:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>(PATTERN)</code>"
 msgid "<code>?replaces(PATTERN)</code>"
-msgstr "<code>(MUSTER)</code>"
+msgstr "<code>?replaces(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DReplaces:PATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DReplaces:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?obsoletes(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?obsoletes(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>~DObsoletes:PATTERN</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>~DObsoletes:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>(PATTERN)</code>"
 msgid "<code>?breaks(PATTERN)</code>"
-msgstr "<code>(MUSTER)</code>"
+msgstr "<code>?breaks(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DBreaks:PATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DBreaks:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>?not(PATTERN)</code>"
 msgid "<code>?enhances(PATTERN)</code>"
-msgstr "<code>?not(MUSTER)</code>"
+msgstr "<code>?enhances(MUSTER)</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
-#, fuzzy
-#| msgid "<code>!PATTERN</code>"
 msgid "<code>~DEnhances:PATTERN</code>"
-msgstr "<code>!MUSTER</code>"
+msgstr "<code>~DEnhances:MUSTER</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
@@ -12824,14 +12791,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Bitte geben Sie die Bestandteile an, die Sie erhalten möchten\n"
-" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
+" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free« »non-free-firmware«\n"
 "\n"
-" Bestandteile [main contrib non-free]:\n"
+" Bestandteile [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
diff --git a/doc/po/es.po b/doc/po/es.po
index e516867bc..e490aa0b7 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -7943,10 +7943,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "El tipo <literal>deb</literal> hace referencia a un típico archivo de Debian "
 "de dos niveles, <filename>distribución/componente</filename>. Habitualmente, "
@@ -8282,7 +8282,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8596,16 +8596,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Utiliza el archivo local (o montado mediante NFS) en «/home/apt/debian» para "
-"«stable/main», «stable/contrib», y «stable/non-free»."
+"«stable/main», «stable/contrib», «stable/non-free», y «stable/non-free-"
+"firmware»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8614,12 +8615,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8630,8 +8631,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8640,12 +8641,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8657,8 +8658,8 @@ msgstr "Línea para obtener el código fuente desde la ubicación anterior."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8667,12 +8668,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9637,11 +9638,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Es una lista de secciones separadas por espacios que aparecen bajo la "
-"distribución; habitualmente, es similar a <literal>main contrib non-free</"
-"literal>."
+"distribución; habitualmente, es similar a <literal>main contrib non-free non-"
+"free-firmware</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12152,14 +12153,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
@@ -13769,19 +13770,6 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ msgid "Some examples:"
 #~ msgstr "Algunos ejemplos:"
 
-#~ msgid ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-#~ msgstr ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-
 #~ msgid "apt"
 #~ msgstr "apt"
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 654631456..ee33fb14b 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -8017,10 +8017,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Le type <literal>deb</literal> décrit une archive Debian classique à deux "
 "niveaux, <filename>distribution/composant</filename>. <literal>distribution</"
@@ -8028,11 +8028,12 @@ msgstr ""
 "<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de "
 "code comme <literal>&debian-stable-codename;</literal> ou <literal>&debian-"
 "testing-codename;</literal>, alors que composant prend les valeurs : "
-"<literal>main</literal>, <literal>contrib</literal> ou <literal>non-free</"
-"literal>. Le type <literal>deb-src</literal> décrit une archive de "
-"distribution de code source pour une distribution Debian dans le même format "
-"que le type <literal>deb</literal>. Une ligne <literal>deb-src</literal> est "
-"nécessaire pour récupérer les index des sources."
+"<literal>main</literal>, <literal>contrib</literal>, <literal>non-free</"
+"literal>, ou <literal>non-free-firmware</literal>. Le type <literal>deb-src</"
+"literal> décrit une archive de distribution de code source pour une "
+"distribution Debian dans le même format que le type <literal>deb</literal>. "
+"Une ligne <literal>deb-src</literal> est nécessaire pour récupérer les index "
+"des sources."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8386,7 +8387,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8800,16 +8801,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Utiliser l'archive stockée localement (ou montée via NFS) dans /home/apt/"
-"debian pour stable/main, stable/contrib et stable/non-free."
+"debian pour stable/main, stable/contrib, stable/non-free et stable/non-free-"
+"firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8818,12 +8820,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8835,8 +8837,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8845,12 +8847,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8860,8 +8862,8 @@ msgstr "Indication des sources pour les lignes précédentes."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8870,12 +8872,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9820,11 +9822,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "C'est une liste de sections séparées par des espaces qui appartiennent à une "
-"distribution ; classiquement, on trouve <literal>main contrib non-free</"
-"literal>."
+"distribution ; classiquement, on trouve <literal>main contrib non-free non-"
+"free-firmware</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12651,15 +12653,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Veuillez indiquer les composants à utiliser\n"
 " Les composants sont en général de la forme suivante :\n"
-" main contrib non-free\n"
+" main contrib non-free non-free-firmware\n"
 "\n"
-" Composants [main contrib non-free] :\n"
+" Composants [main contrib non-free non-free-firmware] :\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
@@ -14363,19 +14365,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "Some examples:"
 #~ msgstr "Exemples :"
 
-#~ msgid ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-#~ msgstr ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-
 #~ msgid "apt"
 #~ msgstr "apt"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 0116d7155..b9193afb5 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -8032,10 +8032,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Il tipo <literal>deb</literal> è un riferimento a un tipico archivio Debian "
 "a due livelli, <filename>distribuzione/componente</filename>. "
@@ -8043,11 +8043,11 @@ msgstr ""
 "<literal>stable</literal> o <literal>testing</literal>, oppure un nome in "
 "codice come <literal>&debian-stable-codename;</literal> o <literal>&debian-"
 "testing-codename;</literal>; componente è uno tra <literal>main</literal>, "
-"<literal>contrib</literal> o <literal>non-free</literal>. Il tipo "
-"<literal>deb-src</literal> è un riferimento al codice sorgente di una "
-"distribuzione Debian nella stessa forma di quella del tipo <literal>deb</"
-"literal>. Per recuperare gli indici dei pacchetti sorgente è necessaria una "
-"riga <literal>deb-src</literal>."
+"<literal>contrib</literal>, <literal>non-free</literal> o <literal>non-free-"
+"firmware</literal>. Il tipo <literal>deb-src</literal> è un riferimento al "
+"codice sorgente di una distribuzione Debian nella stessa forma di quella del "
+"tipo <literal>deb</literal>. Per recuperare gli indici dei pacchetti "
+"sorgente è necessaria una riga <literal>deb-src</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8398,7 +8398,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8765,16 +8765,16 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Usa l'archivio memorizzato in locale (o montato via NFS) in /home/apt/debian "
-"per stable/main, stable/contrib e stable/non-free."
+"per stable/main, stable/contrib, stable/non-free e stable/non-free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8783,12 +8783,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8800,8 +8800,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8810,12 +8810,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8825,8 +8825,8 @@ msgstr "Indicazione per i sorgenti corrispondente alla precedente."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8835,12 +8835,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9777,10 +9777,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Questa è una lista di sezioni che appaiono sotto la distribuzione, separate "
-"da spazi; tipicamente è simile a <literal>main contrib non-free</literal>."
+"da spazi; tipicamente è simile a <literal>main contrib non-free non-free-"
+"firmware</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12432,14 +12433,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
@@ -14172,19 +14173,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "Some examples:"
 #~ msgstr "Alcuni esempi:"
 
-#~ msgid ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-#~ msgstr ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-
 #~ msgid "apt"
 #~ msgstr "apt"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index fe1c213a0..41e497953 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7717,10 +7717,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
 "<filename>distribution/component</filename> を参照します。"
@@ -7728,10 +7728,10 @@ msgstr ""
 "<literal>testing</literal> または <literal>&debian-stable-codename;</"
 "literal> や <literal>&debian-testing-codename;</literal> のようなコード名にな"
 "ります。component は、<literal>main</literal>, <literal>contrib</literal>, "
-"<literal>non-free</literal> のどれかです。<literal>deb-src</literal> タイプで"
-"は、debian ディストリビューションのソースコードを、<literal>deb</literal> タ"
-"イプと同じ形式で参照します。<literal>deb-src</literal> 行は、ソースインデック"
-"スを取得するのに必要です。"
+"<literal>non-free</literal>, <literal>non-free-firmware</literal> のどれかで"
+"す。<literal>deb-src</literal> タイプでは、debian ディストリビューションの"
+"ソースコードを、<literal>deb</literal> タイプと同じ形式で参照します。"
+"<literal>deb-src</literal> 行は、ソースインデックスを取得するのに必要です。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8064,7 +8064,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8420,16 +8420,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "/home/apt/debian に格納されている stable/main, stable/contrib, stable/non-"
-"free 用のローカル (または NFS) アーカイブを使用します。"
+"free, stable/non-free-firmware 用のローカル (または NFS) アーカイブを使用しま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8438,12 +8439,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8453,8 +8454,8 @@ msgstr "上記と同様ですが、不安定版 (開発版) を使用します�
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8463,12 +8464,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8478,8 +8479,8 @@ msgstr "上記のソースの指定は以下のようになります。"
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8488,12 +8489,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9409,10 +9410,10 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
-"<literal>main contrib non-free</literal> のようになります。"
+"<literal>main contrib non-free non-free-firmware</literal> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -11932,14 +11933,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " 取得するコンポーネントを指定してください\n"
-" コンポーネントには以下のようなものがあります: main contrib non-free\n"
+" コンポーネントには以下のようなものがあります: main contrib non-free non-free-firmware\n"
 "\n"
-" コンポーネント [main contrib non-free]:\n"
+" コンポーネント [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 9341092a7..4d011fa18 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -8228,10 +8228,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Het type <literal>deb</literal> verwijst naar een typisch Debian-archief met "
 "twee niveaus, <filename>distributie/component</filename>. De "
@@ -8239,11 +8239,12 @@ msgstr ""
 "zoals <literal>stable</literal> of <literal>testing</literal> of een "
 "codenaam zoals <literal>&debian-stable-codename;</literal> of "
 "<literal>&debian-testing-codename;</literal>, terwijl component een van de "
-"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal> of "
-"<literal>non-free</literal>. Het type <literal>deb-src</literal> verwijst in "
-"dezelfde vorm als het type <literal>deb</literal> naar de broncode van een "
-"Debian distributie. Om bronnenindexen te kunnen ophalen is een <literal>deb-"
-"src</literal>-regel noodzakelijk."
+"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal>, "
+"<literal>non-free</literal> of <literal>non-free-firmware</literal>. Het "
+"type <literal>deb-src</literal> verwijst in dezelfde vorm als het type "
+"<literal>deb</literal> naar de broncode van een Debian distributie. Om "
+"bronnenindexen te kunnen ophalen is een <literal>deb-src</literal>-regel "
+"noodzakelijk."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8602,7 +8603,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8617,7 +8618,7 @@ msgstr ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -9021,16 +9022,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Gebruikt het lokaal opgeslagen (of via NFS aangekoppelde) archief in /home/"
-"apt/debian voor stable/main, stable/contrib, en stable/non-free."
+"apt/debian voor stable/main, stable/contrib, stable/non-free, en stable/non-"
+"free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9039,12 +9041,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9056,8 +9058,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9066,12 +9068,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9081,8 +9083,8 @@ msgstr "Specificatie voor de bronbestanden van het voorgaande."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9091,12 +9093,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -10060,11 +10062,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Dit is een door spaties gescheiden lijst van secties die onder de "
 "distributie te vinden zijn. Doorgaans is dat iets zoals <literal>main "
-"contrib non-free</literal>"
+"contrib non-free non-free-firmware</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12976,14 +12978,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Voer de op te halen componenten in\n"
-" Componenten zijn typisch iets zoals: main contrib non-free\n"
+" Componenten zijn typisch iets zoals: main contrib non-free non-free-firmware\n"
 "\n"
-" Componenten [main contrib non-free]:\n"
+" Componenten [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 32f3077c7..0d5e58ff4 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -7373,10 +7373,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Typ <literal>deb</literal> opisuje typowe dwupoziomowe archiwum Debiana: "
 "<filename>dystrybucja/komponent</filename>. Zazwyczaj <literal>dystrybucja</"
@@ -7714,7 +7714,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8027,34 +8027,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
-#| "for stable/main, stable/contrib, and stable/non-free."
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Użycie archiwum lokalnego (lub montowanego przez NFS) w katalogu /home/jason/"
-"debian dla zasobów stable/main, stable/contrib i stable/non-free."
+"debian dla zasobów stable/main, stable/contrib, stable/non-free i stable/non-"
+"free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb file:/home/jason/debian stable main contrib non-free"
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/jason/debian stable main contrib non-free"
+#, no-wrap
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
-msgstr "deb file:/home/jason/debian stable main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
+msgstr ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8064,21 +8063,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+#, no-wrap
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
-msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
+msgstr ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8089,21 +8090,23 @@ msgstr "Linie źródeł dla powyższego przykładu"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+#, no-wrap
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#, no-wrap
 msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
-msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
+msgstr ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8118,23 +8121,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+#, no-wrap
 msgid ""
 "deb http://deb.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
-"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: http://deb.debian.org/debian\n"
@@ -8147,8 +8144,16 @@ msgid ""
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
-"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8167,14 +8172,17 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: http://archive.debian.org/debian-archive\n"
 "Suites: hamm\n"
 "Components: main"
-msgstr "deb http://archive.debian.org/debian-archive hamm main"
+msgstr ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8193,14 +8201,17 @@ msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
-msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgstr ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8223,14 +8234,17 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
-msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+msgstr ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml
@@ -8240,13 +8254,15 @@ msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#, no-wrap
 msgid ""
 "Types: deb\n"
 "URIs: http://ftp.tlh.debian.org/universe\n"
 "Suites: unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgstr ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8307,10 +8323,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-#, fuzzy
-#| msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
-msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
+msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;."
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
@@ -8882,7 +8896,7 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -11299,14 +11313,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Proszę podać komponenty do pobrania\n"
-" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n"
+" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free non-free-firmware\n"
 "\n"
-" Komponenty [main contrib non-free]:\n"
+" Komponenty [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
@@ -12677,19 +12691,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "Some examples:"
 #~ msgstr "Kilka przykładów:"
 
-#~ msgid ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-#~ msgstr ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-
 #~ msgid "apt"
 #~ msgstr "apt"
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index ac5c3d420..bac974e80 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -8003,10 +8003,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois "
 "níveis, <filename>distribution/component</filename>. A "
@@ -8014,10 +8014,11 @@ msgstr ""
 "<literal>stable</literal> ou <literal>testing</literal> ou um nome de código "
 "como <literal>&debian-stable-codename;</literal> ou <literal>&debian-testing-"
 "codename;</literal> enquanto que componente é um de <literal>main</literal>, "
-"<literal>contrib</literal> ou <literal>non-free</literal>. O tipo "
-"<literal>deb-src</literal> faz referência a um código fonte de distribuição "
-"Debian no mesmo formato que o tipo <literal>deb</literal>. É necessária uma "
-"linha <literal>deb-src</literal> para obter índices das fontes."
+"<literal>contrib</literal>, <literal>non-free</literal> ou <literal>non-free-"
+"firmware</literal>. O tipo <literal>deb-src</literal> faz referência a um "
+"código fonte de distribuição Debian no mesmo formato que o tipo "
+"<literal>deb</literal>. É necessária uma linha <literal>deb-src</literal> "
+"para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8363,7 +8364,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8378,7 +8379,7 @@ msgstr ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8773,16 +8774,16 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Usa o arquivo armazenado localmente (ou montagem NFS) em /home/apt/debian "
-"para stable/main, stable/contrib, e stable/non-free."
+"para stable/main, stable/contrib, stable/non-free e stable/non-free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8791,12 +8792,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8807,8 +8808,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8817,12 +8818,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8832,8 +8833,8 @@ msgstr "Especificação de fontes para o referido acima."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8842,12 +8843,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9793,11 +9794,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Isto é uma lista de secções separada por espaços que aparece sob a "
-"distribuição, tipicamente isto é algo como <literal>main contrib non-free</"
-"literal>"
+"distribuição, tipicamente isto é algo como <literal>main contrib non-free "
+"non-free-firmware</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12634,14 +12635,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Por favor forneça os componentes a obter\n"
-" Tipicamente os componentes são algo como: main contrib non-free\n"
+" Tipicamente os componentes são algo como: main contrib non-free non-free-firmware\n"
 "\n"
-" Componentes [main contrib non-free]:\n"
+" Componentes [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk
@@ -14321,25 +14322,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ msgid "Some examples:"
 #~ msgstr "Alguns exemplos:"
 
-#, fuzzy
-#~| msgid ""
-#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-"
-#~| "free\n"
-#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib "
-#~| "non-free\n"
-#~| "   "
-#~ msgid ""
-#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
-#~ "non-free\n"
-#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
-#~ "contrib non-free\n"
-#~ "   "
-#~ msgstr ""
-#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
-#~ "non-free\n"
-#~ "   "
-
 #~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 91d9a4766..e20334821 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -5982,10 +5982,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6215,7 +6215,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -6475,13 +6475,13 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6491,7 +6491,7 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6502,7 +6502,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6512,7 +6512,7 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6523,7 +6523,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6533,7 +6533,7 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7228,7 +7228,7 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -9421,9 +9421,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index f7da9ba43..c5a012fe4 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -129,8 +129,8 @@
    <literal>distribution</literal> is generally a suite name like
    <literal>stable</literal> or <literal>testing</literal> or a codename like
    <literal>&debian-stable-codename;</literal> or <literal>&debian-testing-codename;</literal>
-   while component is one of <literal>main</literal>, <literal>contrib</literal> or
-   <literal>non-free</literal>. The
+   while component is one of <literal>main</literal>, <literal>contrib</literal>,
+   <literal>non-free</literal> or <literal>non-free-firmware</literal>. The
    <literal>deb-src</literal> type references a Debian distribution's source
    code in the same form as the <literal>deb</literal> type.
    A <literal>deb-src</literal> line is required to fetch source indexes.</para>
@@ -321,7 +321,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
    <literallayout>Types: deb
 URIs: https://deb.debian.org
 Suites: stable
-Components: main contrib non-free
+Components: main contrib non-free non-free-firmware
 Signed-By:
  -----BEGIN PGP PUBLIC KEY BLOCK-----
  .
@@ -505,26 +505,26 @@ Signed-By:
 
  <refsect1><title>Examples</title>
    <para>Uses the archive stored locally (or NFS mounted) at /home/apt/debian
-   for stable/main, stable/contrib, and stable/non-free.</para>
-   <literallayout>deb file:/home/apt/debian stable main contrib non-free</literallayout>
+   for stable/main, stable/contrib, stable/non-free and stable/non-free-firmware.</para>
+   <literallayout>deb file:/home/apt/debian stable main contrib non-free non-free-firmware</literallayout>
    <literallayout>Types: deb
 URIs: file:/home/apt/debian
 Suites: stable
-Components: main contrib non-free</literallayout>
+Components: main contrib non-free non-free-firmware</literallayout>
 
    <para>As above, except this uses the unstable (development) distribution.</para>
-   <literallayout>deb file:/home/apt/debian unstable main contrib non-free</literallayout>
+   <literallayout>deb file:/home/apt/debian unstable main contrib non-free non-free-firmware</literallayout>
    <literallayout>Types: deb
 URIs: file:/home/apt/debian
 Suites: unstable
-Components: main contrib non-free</literallayout>
+Components: main contrib non-free non-free-firmware</literallayout>
 
    <para>Sources specification for the above.</para>
-   <literallayout>deb-src file:/home/apt/debian unstable main contrib non-free</literallayout>
+   <literallayout>deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware</literallayout>
    <literallayout>Types: deb-src
 URIs: file:/home/apt/debian
 Suites: unstable
-Components: main contrib non-free</literallayout>
+Components: main contrib non-free non-free-firmware</literallayout>
 
    <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
    while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>
diff --git a/dselect/setup b/dselect/setup
index 8689d2388..58eecfcdc 100755
--- a/dselect/setup
+++ b/dselect/setup
@@ -30,8 +30,8 @@ my $boldoff=`setterm -bold off`;
 
 my @known_types           = ('deb');
 my @known_access         = ('http', 'ftp', 'file');
-my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US');
-my @typical_components    = ('main', 'contrib', 'non-free');
+my @typical_distributions = ('stable', 'unstable', 'testing');
+my @typical_components    = ('main', 'contrib', 'non-free', 'non-free-firmware');
 
 my %known_access           = map {($_,$_)} @known_access;
 my %typical_distributions  = map {($_,$_)} @typical_distributions;
@@ -118,9 +118,9 @@ sub get_source {
   }
 
   $type         = 'deb';
-  $urn          = "http://http.us.debian.org/debian" unless $urn;
+  $urn          = "http://deb.debian.org/debian" unless $urn;
   $distribution = "stable" unless $distribution;
-  $components   = "main contrib non-free" unless $components;
+  $components   = "main contrib non-free non-free-firmware" unless $components;
 
     
   $rec->{'Type'} = 'deb';
diff --git a/test/integration/test-apt-get-update-sourceslist-warning b/test/integration/test-apt-get-update-sourceslist-warning
index a99356b8b..60c8d7308 100755
--- a/test/integration/test-apt-get-update-sourceslist-warning
+++ b/test/integration/test-apt-get-update-sourceslist-warning
@@ -11,35 +11,64 @@ setupaptarchive --no-update
 testsuccess apt update
 testsuccess apt update --no-download
 
-echo 'deb ftp://ftp.tlh.debian.org/debian zurg main' > rootdir/etc/apt/sources.list.d/ftpshutdown.list
-cat > rootdir/var/lib/apt/lists/ftp.tlh.debian.org_debian_dists_zurg_Release <<EOF
+cat > rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_Release <<EOF
 Origin: Debian
 Label: Debian
 Suite: unreleased
-Codename: zurg
-Date: Fri, 14 Jul 2017 11:34:35 +0000
+Codename: bookworm
+Date: Sun, 29 Jan 2023 20:14:10 +0000
 Architectures: amd64
-Components: main
-Description: Debian x.y Zurg - Not Released
+Components: main contrib non-free non-free-firmware
+Description: Debian x.y Bookworm - Not Released
 EOF
-chmod 644 rootdir/var/lib/apt/lists/ftp.tlh.debian.org_debian_dists_zurg_Release
+chmod 644 rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_Release
+touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_main_binary-amd64_Packages
+touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_contrib_binary-amd64_Packages
+touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages
+touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free-firmware_binary-amd64_Packages
 
-testwarningequal "Reading package lists...
+NOTESURL='https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.html#non-free-split'
+BOILERPLATE='Reading package lists...
 Building dependency tree...
-All packages are up to date.
-W: Debian shuts down public FTP services currently still used in your sources.list(5) as 'ftp://ftp.tlh.debian.org/debian/'.
-   See press release https://debian.org/News/2017/20170425 for details." apt update --no-download
+All packages are up to date.'
 
+msgmsg 'Do not suggest new non-free-firmware component if no non-free'
+echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE" apt update --no-download
+echo 'deb-src http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE" apt update --no-download
 
-echo 'deb http://apt:debian@ftp.tlh.debian.org/debian zurg main' > rootdir/etc/apt/sources.list.d/ftpshutdown.list
-testsuccessequal "Reading package lists...
-Building dependency tree...
-All packages are up to date.
-N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'http://ftp.tlh.debian.org/debian'" apt update --no-download
+msgmsg 'Is non-free-firmware missing?'
+echo 'deb http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list
+cat >> rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages <<EOF
+Package: firmware-linux-nonfree
+Architecture: all
+Version: 1
+EOF
+testsuccessequal "$BOILERPLATE" apt update --no-download
+echo -n > rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages
+testsuccessequal "$BOILERPLATE
+N: Repository 'Debian bookworm' changed its 'non-free component' value from 'non-free' to 'non-free non-free-firmware'
+N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download
 
+msgmsg 'Component already present'
+echo 'deb http://example.org/debian bookworm non-free non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE" apt update --no-download
+echo 'deb http://example.org/debian bookworm non-free
+deb http://example.org/debian bookworm non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE" apt update --no-download
 
-echo 'deb tor+https://apt:debian@ftp.tlh.debian.org/debian zurg main' > rootdir/etc/apt/sources.list.d/ftpshutdown.list
-testsuccessequal "Reading package lists...
-Building dependency tree...
-All packages are up to date.
-N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'tor+https://ftp.tlh.debian.org/debian'" apt update --no-download
+msgmsg 'Detect login info embedded in sources.list'
+echo 'deb http://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE
+N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'http://example.org/debian'" apt update --no-download
+echo 'deb tor+https://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
+testsuccessequal "$BOILERPLATE
+N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'tor+https://example.org/debian'" apt update --no-download
+
+msgmsg 'Firmware packages without upgrades'
+echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
+insertinstalledpackage 'firmware-linux-nonfree' 'all' '1'
+testsuccessequal "$BOILERPLATE
+N: Repository 'Debian bookworm' changed its 'firmware component' value from 'non-free' to 'non-free-firmware'
+N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download
diff --git a/test/integration/test-apt-move-and-forget-manual-sections b/test/integration/test-apt-move-and-forget-manual-sections
index 4617abab3..ab90be0c0 100755
--- a/test/integration/test-apt-move-and-forget-manual-sections
+++ b/test/integration/test-apt-move-and-forget-manual-sections
@@ -11,15 +11,18 @@ testsuccess grep '^oldlibs$' move-autobit.sections
 
 buildsimplenativepackage 'libabc' 'native' '1' 'stable' '' '' 'libs'
 buildsimplenativepackage 'libabc' 'native' '2' 'unstable' 'Depends: libdef' '' 'oldlibs'
+buildsimplenativepackage 'libzoo' 'native' '1' 'stable' '' '' 'libs'
+buildsimplenativepackage 'libzoo' 'native' '2' 'unstable' 'Depends: libdef' '' 'non-free/oldlibs'
 buildsimplenativepackage 'libdef' 'native' '1' 'unstable' '' '' 'libs'
 setupaptarchive
 
 testmarkedauto
 testmarkedmanual
 
+msgmsg 'Move bit on install of replacement'
 testsuccess aptget install libabc/stable -y
 testdpkginstalled 'libabc'
-testdpkgnotinstalled 'libdef'
+testdpkgnotinstalled 'libdef' 'libzoo'
 
 testmarkedmanual 'libabc'
 testmarkedauto
@@ -29,3 +32,43 @@ testdpkginstalled 'libabc' 'libdef'
 
 testmarkedauto 'libabc'
 testmarkedmanual 'libdef'
+
+testsuccess apt autopurge -y
+testdpkgnotinstalled 'libabc' 'libzoo'
+
+msgmsg 'Do not move bit if replacement is already installed'
+testsuccess aptget install libzoo/stable -y
+testdpkginstalled 'libzoo'
+
+testmarkedmanual 'libzoo' 'libdef'
+testmarkedauto
+
+testsuccess aptmark auto libdef
+testmarkedauto 'libdef'
+
+testsuccess aptget dist-upgrade -y
+testdpkginstalled 'libzoo' 'libdef'
+
+testmarkedmanual 'libzoo'
+testmarkedauto 'libdef'
+
+testsuccess apt autopurge -y libzoo-
+testdpkgnotinstalled 'libabc' 'libzoo' 'libdef'
+
+msgmsg 'Move bit on install of replacement (subsection)'
+testfailure grep '^non-free/oldlibs$' move-autobit.sections
+testsuccess aptget install libzoo/stable -y
+testdpkginstalled 'libzoo'
+testdpkgnotinstalled 'libdef' 'libabc'
+
+testmarkedmanual 'libzoo'
+testmarkedauto
+
+testsuccess aptget dist-upgrade -y
+testdpkginstalled 'libzoo' 'libdef'
+
+testmarkedauto 'libzoo'
+testmarkedmanual 'libdef'
+
+testsuccess apt autopurge -y
+testdpkgnotinstalled 'libabc' 'libzoo'
diff --git a/test/integration/test-apt-never-markauto-sections b/test/integration/test-apt-never-markauto-sections
index a77d6b22b..b47966e75 100755
--- a/test/integration/test-apt-never-markauto-sections
+++ b/test/integration/test-apt-never-markauto-sections
@@ -8,12 +8,13 @@ configarchitecture 'amd64' 'i386'
 
 aptconfig dump --no-empty --format '%v%n' APT::Never-MarkAuto-Sections > nevermarkauto.sections
 testsuccess grep '^metapackages$' nevermarkauto.sections
+testfailure grep '^universe/metapackages$' nevermarkauto.sections
 
 buildsimplenativepackage 'mydesktop' 'all' '1' 'unstable' 'Depends: mydesktop-core, foreignpkg
 Recommends: notavailable' '' 'metapackages'
 buildsimplenativepackage 'mydesktop-core' 'amd64' '1' 'unstable' 'Depends: bad-texteditor | texteditor, browser (>= 42), nosection, foreignpkg
 Recommends: notavailable
-Multi-Arch: foreign' '' 'metapackages'
+Multi-Arch: foreign' '' 'universe/metapackages'
 buildsimplenativepackage 'browser' 'amd64' '41' 'stable'
 buildsimplenativepackage 'browser' 'amd64' '42' 'unstable'
 buildsimplenativepackage 'texteditor' 'amd64' '1' 'stable'
diff --git a/vendor/debian/CMakeLists.txt b/vendor/debian/CMakeLists.txt
new file mode 100644
index 000000000..7c0ccb7d2
--- /dev/null
+++ b/vendor/debian/CMakeLists.txt
@@ -0,0 +1,2 @@
+execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/apt-vendor.ent.sh
+                OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/apt-vendor.ent)
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index bb6180816..4d02343b2 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -6,15 +6,15 @@
 <!ENTITY keyring-master-filename "">
 <!ENTITY keyring-uri "">
 
-<!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free
-deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free
-deb http://deb.debian.org/debian-security &debian-stable-codename;-security main contrib non-free">
+<!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free non-free-firmware
+deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free non-free-firmware
+deb http://deb.debian.org/debian-security &debian-stable-codename;-security main contrib non-free non-free-firmware">
 <!ENTITY sourceslist-sources-format "Types: deb
 URIs: http://deb.debian.org/debian
 Suites: &debian-stable-codename; &debian-stable-codename;-updates
-Components: main contrib non-free
+Components: main contrib non-free non-free-firmware
 
 Types: deb
 URIs: http://deb.debian.org/debian-security
 Suites: &debian-stable-codename;-security
-Components: main contrib non-free">
+Components: main contrib non-free non-free-firmware">