diff --git a/system/base/libpcre2/actions.py b/system/base/libpcre2/actions.py
index ac5c5d15..b9a66148 100644
--- a/system/base/libpcre2/actions.py
+++ b/system/base/libpcre2/actions.py
@@ -14,7 +14,7 @@ bindir = "/usr/bin32" if get.buildTYPE() == "emul32" else "/usr/bin"
 
 def setup():
     autotools.autoreconf("-vif")
-    autotools.configure("--enable-jit \
+    options = "--enable-jit \
                          --libdir=%s \
                          --bindir=%s \
                          --enable-pcre2test-libreadline \
@@ -22,8 +22,13 @@ def setup():
                          --enable-pcre2-16 \
                          --enable-unicode \
                          --docdir=/%s/%s \
-                         --disable-static" % (LIBDIR, bindir, get.docDIR(), get.srcNAME()))
-    
+                         --disable-static" % (LIBDIR, bindir, get.docDIR(), get.srcNAME())
+
+    if get.buildTYPE() != "emul32":
+        options += " --enable-pcre2grep-libz \
+                     --enable-pcre2grep-libbz2 \
+                   "
+    autotools.configure(options)
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
diff --git a/system/base/libpcre2/pspec.xml b/system/base/libpcre2/pspec.xml
index d06bdb8e..6fdd69d7 100644
--- a/system/base/libpcre2/pspec.xml
+++ b/system/base/libpcre2/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>Perl-compatible regular expression library</Summary>
         <Description>The PCRE (Perl Compatible Regular Expressions) library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.</Description>
-        <Archive sha1sum="2e5ee2dd397fa8c3ce9aed1a986e51d66a88bdb0" type="tarbz2">https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2</Archive>
+        <Archive sha1sum="5a433f92b29083d0d8ccd4ec56e3afbe1fa09863" type="tarbz2">https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>readline-devel</Dependency>
         </BuildDependencies>
@@ -21,6 +21,8 @@
     <Package>
         <Name>libpcre2</Name>
         <RuntimeDependencies>
+            <Dependency>zlib</Dependency>
+            <Dependency>bzip2</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>readline</Dependency>
         </RuntimeDependencies>
@@ -69,6 +71,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2022-08-23</Date>
+            <Version>10.40</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
 	<Update release="4">
             <Date>2020-12-09</Date>
             <Version>10.35</Version>