diff --git a/general/prog/perl-modules.xml b/general/prog/perl-modules.xml
index 05ee6078d8..62b573b377 100644
--- a/general/prog/perl-modules.xml
+++ b/general/prog/perl-modules.xml
@@ -83,6 +83,9 @@
   <!ENTITY Net-DNS-download-http "http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
   <!ENTITY Net-DNS-md5sum "ed17abd6e7e3ba0a8db42649e34a53ae">
 
+  <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/F/FD/FDESAR/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
+  <!ENTITY Parse-Yapp-md5sum "7bfca736d6af36c51edf7a97111a8f3b">
+
   <!ENTITY Readonly-XS-download-http "http://www.cpan.org/authors/id/R/RO/ROODE/Readonly-XS-&Readonly-XS-version;.tar.gz">
   <!ENTITY Readonly-XS-md5sum "df71f29abfcbd14c963f912d6d6ded6b">
 
@@ -1378,6 +1381,33 @@ this uses the <xref linkend="perl-build-install"/></literallayout>
       </listitem>
     </itemizedlist> -->
 
+    <!-- Parse::Yapp -->
+    <bridgehead renderas="sect3" id="perl-parse-yapp"
+    xreflabel="Parse::Yapp-&Parse-Yapp-version;">
+    Parse::Yapp-&Parse-Yapp-version;</bridgehead>
+
+    <indexterm zone="perl-modules perl-parse-yapp">
+      <primary sortas="a-Parse-Yapp">Parse::Yapp</primary>
+    </indexterm>
+
+    <para>Parse::Yapp is a Perl extension for generating and using LALR
+    parsers.. This module uses the standard
+    <xref linkend="perl-standard-install"/>.</para>
+
+    &lfs7a_checked;
+
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="&Parse-Yapp-download-http;">Parse-Yapp-&Parse-Yapp-version;</ulink>
+        </para>
+      </listitem>
+      <listitem>
+<literallayout>&Parse-Yapp-download-http;
+MD5 sum: &Parse-Yapp-md5sum;</literallayout>
+      </listitem>
+    </itemizedlist>
+
     <!-- Regexp::Common -->
     <bridgehead renderas="sect3" id="perl-regexp-common"
     xreflabel="Regexp::Common-&Regexp-Common-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 32d9c224dd..d74ab35ccd 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,19 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>September 27th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Add Parse-Yapp-1.05.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add Parse-Yapp as recommended dependency for Samba
+          to avoid upgrade issue.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 26th, 2016</para>
       <itemizedlist>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 8f8df00a92..ba864a2b18 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -70,7 +70,8 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="libtirpc"/>,
-      <xref linkend="libxslt"/> (for documentation), and
+      <xref linkend="libxslt"/> (for documentation),
+      <xref linkend="perl-parse-yapp"/>, and
       <xref linkend="openldap"/>
     </para>
 
diff --git a/packages.ent b/packages.ent
index 500db98151..a07d9f7944 100644
--- a/packages.ent
+++ b/packages.ent
@@ -347,6 +347,7 @@
 <!ENTITY LWP-Protocol-https-version   "6.06">
 <!ENTITY Module-Build-version         "0.4220">
 <!ENTITY Net-DNS-version              "1.06">
+<!ENTITY Parse-Yapp-version           "1.05">
 <!ENTITY Regexp-Common-version        "2016060801">
 <!ENTITY SGMLSpm-version              "1.1">
 <!ENTITY Test-Command-version         "0.11">