Index: general/prog/pycrypto.xml
===================================================================
--- general/prog/pycrypto.xml	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
+++ general/prog/pycrypto.xml	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY pycrypto-download-http "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-&pycrypto-version;.tar.gz">
+  <!ENTITY pycrypto-download-ftp  " ">
+  <!ENTITY pycrypto-md5sum        "55a61a054aa66812daf5161a0d5d7eda">
+  <!ENTITY pycrypto-size          "440 KB">
+  <!ENTITY pycrypto-buildsize     "14 MB">
+  <!ENTITY pycrypto-time          "0.1 SBU">
+]>
+
+  <!-- Begin pycrypto -->
+  <sect2 id="pycrypto" xreflabel="PyCrypto-&pycrypto-version;" revision="systemd">
+
+    <title>PyCrypto-&pycrypto-version;</title>
+
+    <indexterm zone="pycrypto">
+      <primary sortas="a-pycrypto">pycrypto</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to the PyCrypto Module</title>
+
+      <para>
+        <application>PyCrypto</application> is a collection of both secure hash
+        functions (such as SHA256 and RIPEMD160), and various encryption
+        algorithms (AES, DES, RSA, ElGamal, etc.).
+      </para>
+
+      &lfs80_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycrypto-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycrypto-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycrypto-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycrypto-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycrypto-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycrypto-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyCrypto Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycrypto"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCrypto</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+
+      <para>
+        To build the <application>Python 2</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To build the <application>Python 3</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            pycrypto-&pycrypto-version;-py2.7.egg-info and/or
+            pycrypto-&pycrypto-version;-py3.6.egg-info
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/Crypto and/or
+            /usr/lib/python&python3-majorver;/site-packages/Crypto
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End pycrypto -->
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision c2c08bac15f2bcd4f2d3e118ecbe5848335d40a8)
+++ general/prog/python-modules.xml	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
@@ -50,4 +50,9 @@
         <para>
           <xref linkend="pycairo"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pycrypto"/>
         </para>
       </listitem>
@@ -130,4 +135,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pycrypto.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pygobject2.xml"/>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c2c08bac15f2bcd4f2d3e118ecbe5848335d40a8)
+++ introduction/welcome/changelog.xml	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
@@ -49,4 +49,7 @@
           <ulink url="&blfs-ticket-root;8983">#8983</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Add PyCrypto-2.6.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision c2c08bac15f2bcd4f2d3e118ecbe5848335d40a8)
+++ networking/netprogs/samba.xml	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
@@ -73,5 +73,7 @@
       <xref linkend="libtirpc"/>,
       <xref linkend="libxslt"/> (for documentation),
-      <xref linkend="perl-parse-yapp"/>, and
+      <xref linkend="perl-parse-yapp"/>,
+      <xref linkend="pycrypto"/>,
+      <xref linkend="python3"/>, and
       <xref linkend="openldap"/>
     </para>
@@ -92,5 +94,4 @@
       <xref linkend="nss"/>,
       <xref linkend="popt"/>,
-      <xref linkend="python3"/>,
       <xref linkend="talloc"/> (included),
       <xref linkend="vala"/>,
@@ -105,6 +106,4 @@
       <ulink url="&pypi;/m2crypto">M2Crypto</ulink> (required for ADS),
       <ulink url="http://www.openafs.org/">OpenAFS</ulink>,
-      <ulink url="&pypi;/pycrypto/">PyCrypto</ulink> (required for both ADS and
-      the test suite),
       <ulink url="&pypi;/pygpgme/">PyGPGME</ulink> (recommended for ADS),
       <ulink url="https://tevent.samba.org/">tevent</ulink> (included), and
Index: packages.ent
===================================================================
--- packages.ent	(revision c2c08bac15f2bcd4f2d3e118ecbe5848335d40a8)
+++ packages.ent	(revision 82eddd479887499645998a1685fb4e1f8d4cca5a)
@@ -381,4 +381,5 @@
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pycairo-version              "1.10.0">
+<!ENTITY pycrypto-version             "2.6.1">
 <!ENTITY pygobject2-version           "2.28.6">
 <!ENTITY pygobject3-version           "3.22.0">
