diff --git a/amule-dlp/Makefile b/amule-dlp/Makefile
index 002f81ed0..d99a1b04b 100644
--- a/amule-dlp/Makefile
+++ b/amule-dlp/Makefile
@@ -33,8 +33,9 @@ define Package/amule-dlp
   CATEGORY:=Network
   TITLE:=A multi-platform eMule-like ed2k client
   URL:=http://www.amule.org/
-  DEPENDS:=+libpng +libpthread +libncurses +libreadline +libwxbase +libupnp +libbfd +antileech \
-	$(ICONV_DEPENDS) $(INTL_DEPENDS) +!AMULE_CRYPTOPP_STATIC_LINKING:libcryptopp
+  DEPENDS:=+antileech +libpng +libpthread +libncurses +libreadline +libwxbase \
+	+libupnp +libbfd $(ICONV_DEPENDS) $(INTL_DEPENDS) \
+	+!AMULE_CRYPTOPP_STATIC_LINKING:libcryptopp
 endef
 
 define Package/amule-dlp/config
diff --git a/amule-dlp/patches/003_gcc_11.patch b/amule-dlp/patches/003_gcc_11.patch
new file mode 100644
index 000000000..95a1ae654
--- /dev/null
+++ b/amule-dlp/patches/003_gcc_11.patch
@@ -0,0 +1,10 @@
+--- a/src/libs/common/MuleDebug.cpp
++++ b/src/libs/common/MuleDebug.cpp
+@@ -56,6 +56,7 @@
+ 
+ #include <vector>
+ 
++#include <exception>
+ 
+ /**
+  * This functions displays a verbose description of
diff --git a/openvpn-easy-rsa-whisky/Makefile b/openvpn-easy-rsa-whisky/Makefile
index 20cc1fd71..23e9dcbef 100644
--- a/openvpn-easy-rsa-whisky/Makefile
+++ b/openvpn-easy-rsa-whisky/Makefile
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git
-PKG_SOURCE_VERSION:=19a20046ca0110ad5435d69f481c5148726af252
+PKG_SOURCE_VERSION:=150e96ec9b290396ccbe160bd23f6dd1b277250d
 
 PKG_NAME:=openvpn-easy-rsa
-PKG_VERSION:=3.0.8
+PKG_VERSION:=3.0.9
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 
diff --git a/openvpn-easy-rsa-whisky/patches/100-fix_EASYRSA_REQ_CN.patch b/openvpn-easy-rsa-whisky/patches/100-fix_EASYRSA_REQ_CN.patch
deleted file mode 100644
index ddd5b60d4..000000000
--- a/openvpn-easy-rsa-whisky/patches/100-fix_EASYRSA_REQ_CN.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/easyrsa3/easyrsa
-+++ b/easyrsa3/easyrsa
-@@ -607,7 +607,7 @@
- 
- 	# Default CN only when not in global EASYRSA_BATCH mode:
- 	# shellcheck disable=SC2015
--	[ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="Easy-RSA CA"
-+	[ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="${EASYRSA_REQ_CN:-Easy-RSA CA}"
- 
- 	out_key_tmp="$(easyrsa_mktemp)" || die "Failed to create temporary file"
- 	out_file_tmp="$(easyrsa_mktemp)" || die "Failed to create temporary file"
diff --git a/openvpn-easy-rsa-whisky/patches/101-static_EASYRSA.patch b/openvpn-easy-rsa-whisky/patches/101-static_EASYRSA.patch
index 124bf48f2..29e6b9258 100644
--- a/openvpn-easy-rsa-whisky/patches/101-static_EASYRSA.patch
+++ b/openvpn-easy-rsa-whisky/patches/101-static_EASYRSA.patch
@@ -1,24 +1,24 @@
 --- a/easyrsa3/easyrsa
 +++ b/easyrsa3/easyrsa
-@@ -1557,8 +1557,7 @@
- 	prog_file="$0"
- 	prog_file2="$(which -- "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
- 	prog_file2="$(readlink -f "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
+@@ -2042,10 +2042,10 @@ vars_setup() {
+ 	#prog_file2="$(which -- "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
+ 	# Removed for breaking New Windows - To re-enable provide a SOLUTION
+ 	#prog_file2="$(readlink -f "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
 -	prog_dir="${prog_file%/*}"
++	prog_dir="/etc/easy-rsa"
+ 
+ 	# Program dir vars - This location is least wanted.
 -	prog_vars="${prog_dir}/vars"
 +	prog_vars="/etc/easy-rsa/vars"
- 	# set up PKI path
+ 	# set up PKI path vars - Top preference
  	pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
- 
-@@ -1588,9 +1587,9 @@
- 	fi
- 	
+ 	keep_pki_vars="$pki_vars"
+@@ -2156,7 +2156,7 @@ Expected to find 'vars' file:
  	# Set defaults, preferring existing env-vars if present
--	set_var EASYRSA		"$prog_dir"
-+	set_var EASYRSA		"/etc/easy-rsa"
- 	set_var EASYRSA_OPENSSL	openssl
--	set_var EASYRSA_PKI	"$PWD/pki"
-+	set_var EASYRSA_PKI	"/tmp/easyrsa3/pki"
- 	set_var EASYRSA_DN	cn_only
- 	set_var EASYRSA_REQ_COUNTRY	"US"
+ 	set_var EASYRSA					"$PWD"
+ 	set_var EASYRSA_OPENSSL			openssl
+-	set_var EASYRSA_PKI				"$PWD/pki"
++	set_var EASYRSA_PKI				"/tmp/easyrsa3/pki"
+ 	set_var EASYRSA_DN				cn_only
+ 	set_var EASYRSA_REQ_COUNTRY		"US"
  	set_var EASYRSA_REQ_PROVINCE	"California"