<para>
To ensure that your upload will be accepted, you should discuss the changes
with the stable release team before you upload. For that, file a bug against
-the release.debian.org pseudopackage using reportbug, including the patch you want to
+the <systemitem role="package">release.debian.org</systemitem> pseudo-package
+using <command>reportbug</command>, including the patch you want to
apply to the package version currently in <literal>stable</literal>. Always
be verbose and detailed in your changelog entries for uploads to the
<literal>stable</literal> distribution.
<para>
If for some reason you want to completely remove a package (say, if it is an
old compatibility library which is no longer required), you need to file a bug
-against <literal>ftp.debian.org</literal> asking that the package be removed;
+against <systemitem role="package">&ftp-debian-org;</systemitem> asking that the package be removed;
as all bugs, this bug should normally have normal severity.
The bug title should be in the form <literal>RM: <replaceable>package</replaceable>
<replaceable>[architecture list]</replaceable> --
if the removal request only applies to some architectures, not all. Note
that the <command>reportbug</command> will create a title conforming
to these rules when you use it to report a bug against the
-<literal>ftp.debian.org</literal> pseudo-package.
+<systemitem role="package">&ftp-debian-org;</systemitem> pseudo-package.
</para>
<para>