--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -239,16 +239,21 @@
 #endif
 #elif defined(XP_MACOSX)
 @BINPATH@/libotr.5.dylib
 #elif defined(XP_LINUX)
 @BINPATH@/libotr.so.5
 #endif
 #endif
 
+; OpenPGP (librnp)
+#ifdef MOZ_OPENPGP
+@BINPATH@/@DLL_PREFIX@rnp@DLL_SUFFIX@
+#endif
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Chrome Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 @RESPATH@/chrome/classic@JAREXT@
 @RESPATH@/chrome/classic.manifest
 
 ; [DevTools Startup Files]

--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -99,10 +99,12 @@ set_config('TB_LIBOTR_PREBUILT', pkg_lib
 set_config('MOZ_TELEMETRY_EXTRA_HISTOGRAM_FILES', ['/comm/mail/components/telemetry/Histograms.json'])
 set_config('MOZ_TELEMETRY_EXTRA_SCALAR_FILES', ['/comm/mail/components/telemetry/Scalars.yaml'])
 set_config('MOZ_TELEMETRY_EXTRA_EVENT_FILES', ['/comm/mail/components/telemetry/Events.yaml'])
 
 include('../build/moz.configure/gecko_source.configure')
 
 include('../mailnews/moz.configure')
 
+include('../third_party/openpgp.configure', when='--enable-openpgp')
+
 imply_option('--enable-app-system-headers', True)
 include('../../toolkit/moz.configure')