diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 9046e6ca30..e15768dcfe 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -256,7 +256,7 @@ devfs_system_ruleset="system"</programlisting>
       <para>If one has an older version of &windows; without native
 	<acronym>IPP</acronym> printing support, then the general
 	means of connecting to a <application>CUPS</application>
-	printer is to use <package>net/samba3</package> and
+	printer is to use <package>net/samba410</package> and
 	<application>CUPS</application> together, which is a topic
 	outside the scope of this chapter.</para>
     </sect2>
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 41f695ac38..f94c82e456 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -3897,14 +3897,14 @@ AddModule mod_php5.c
 
     <para>On &os;, the <application>Samba</application> client
       libraries can be installed using the
-      <package>net/samba48</package> port or package.  The
+      <package>net/samba410</package> port or package.  The
       client provides the ability for a &os; system to access
       <acronym>SMB/CIFS</acronym> shares in a &microsoft.windows;
       network.</para>
 
     <para>A &os; system can also be configured to act as a
       <application>Samba</application> server by installing the same
-      <package>net/samba48</package> port or package.  This allows the
+      <package>net/samba410</package> port or package.  This allows the
       administrator to create <acronym>SMB</acronym>/<acronym>CIFS</acronym>
       shares on
       the &os; system which can be accessed by clients running
@@ -4063,8 +4063,8 @@ directory mask = 0755</programlisting>
 
 	<para>This section has only mentioned the most commonly used
 	  settings.  Refer to the <link
-	    xlink:href="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/">Official
-	    Samba HOWTO</link> for additional information about the
+	    xlink:href="https://wiki.samba.org">Official
+	    Samba Wiki</link> for additional information about the
 	  available configuration options.</para>
       </sect3>
     </sect2>
@@ -4103,7 +4103,7 @@ Starting smbd.</screen>
 	&microsoft.windows; networks.  For more information about
 	functionality beyond the basic configuration described here,
 	refer to <uri
-	  xlink:href="http://www.samba.org">http://www.samba.org</uri>.</para>
+	  xlink:href="https://www.samba.org">https://www.samba.org</uri>.</para>
     </sect2>
   </sect1>