diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index c059d67..28b8e14 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -29,13 +29,16 @@ backup=('etc/syslog-ng/scl.conf'
         'etc/logrotate.d/syslog-ng'
         'etc/default/syslog-ng@default')
 source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
+        syslog-ng-3.32.1-libesmtp-autoconf-pkgconf.patch
         syslog-ng.conf syslog-ng.logrotate)
 sha512sums=('c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280'
+            'a70e5e2535b16aee2bbb51c1278d6c7c2dd709ce84f3234539543d958559c4972a2053c6781ca8fd391bb9c239c847aba336c8da892724e63c2ab2fbd5063d78'
             '29beb12baa60b959d7cbc105545a5334bcee200e49f2b5d12ce51139a7e916fe2afcd505a265ce402e7f88b8cbb42e98a6b06cff1b641368dd9ee459177bf9cc'
             'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -p1 -i ../syslog-ng-3.32.1-libesmtp-autoconf-pkgconf.patch
   sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng@.service
   sed -i -e 's|/var/run|/run|g' contrib/systemd/syslog-ng@default
 }
@@ -49,6 +52,7 @@ build() {
     --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --enable-manpages --enable-all-modules --disable-java --disable-java-modules  \
     --disable-riemann --with-python=3 --with-jsonc=system
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
diff --git a/trunk/syslog-ng-3.32.1-libesmtp-autoconf-pkgconf.patch b/trunk/syslog-ng-3.32.1-libesmtp-autoconf-pkgconf.patch
new file mode 100644
index 0000000..9a4ef37
--- /dev/null
+++ b/trunk/syslog-ng-3.32.1-libesmtp-autoconf-pkgconf.patch
@@ -0,0 +1,47 @@
+From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
+ <laszlo.varady@protonmail.com>
+Date: Sun, 9 May 2021 03:43:46 +0200
+Subject: [PATCH] configure: add pkg-config detection for libesmtp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady <laszlo.varady@protonmail.com>
+---
+ configure.ac | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86b67ba9a2..bd6efa8711 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
+ 		CPPFLAGS="$CPPFLAGS_SAVE"
+ 		LDFLAGS="$LDFLAGS_SAVE"
+ 	else
+-		AC_MSG_CHECKING(for libESMTP)
+-		if libesmtp-config --version >/dev/null 2>&1; then
+-			AC_MSG_RESULT(yes)
+-			LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
+-			LIBESMTP_LIBS="`libesmtp-config --libs`"
+-		else
+-			AC_MSG_RESULT(no)
+-			libesmtp=no
+-		fi
++		PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no")
++		if test "x$libesmtp" = "xno"; then
++			AC_MSG_CHECKING(for libESMTP with libesmtp-config)
++			if libesmtp-config --version >/dev/null 2>&1; then
++				AC_MSG_RESULT(yes)
++				LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
++				LIBESMTP_LIBS="`libesmtp-config --libs`"
++				libesmtp="yes"
++			else
++				AC_MSG_RESULT(no)
++				libesmtp=no
++			fi
++                fi
+ 	fi
+ 	if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
+ 		AC_MSG_ERROR(libESMTP not found)