diff --git a/build-config/Makefile b/build-config/Makefile
index 042238b2f..57c90c9d1 100644
--- a/build-config/Makefile
+++ b/build-config/Makefile
@@ -502,10 +502,6 @@ ifeq ($(SHIM_ENABLE),yes)
   include make/shim.make
 endif
 
-ifeq ($(LIBPCAP_ENABLE),yes)
-  include make/libpcap.make
-endif
-
 ifeq ($(TCPDUMP_ENABLE),yes)
   include make/tcpdump.make
 endif
diff --git a/build-config/make/images.make b/build-config/make/images.make
index 3dd5cbee9..02cc36fbf 100644
--- a/build-config/make/images.make
+++ b/build-config/make/images.make
@@ -122,10 +122,6 @@ ifeq ($(SECURE_GRUB),no)
   GPG_SIGN_SECRING = ''
 endif
 
-ifeq ($(LIBPCAP_ENABLE),yes)
-  PACKAGES_INSTALL_STAMPS += $(LIBPCAP_STAMP)
-endif
-
 ifeq ($(TCPDUMP_ENABLE),yes)
   PACKAGES_INSTALL_STAMPS += $(TCPDUMP_STAMP)
 endif
diff --git a/build-config/make/libpcap.make b/build-config/make/libpcap.make
old mode 100755
new mode 100644
index 527b7099e..9b0c91994
--- a/build-config/make/libpcap.make
+++ b/build-config/make/libpcap.make
@@ -9,8 +9,8 @@
 # This is a makefile fragment that defines the build of libpcap
 #
 
-LIBPCAP_VERSION			= 1.10.4
-LIBPCAP_TARBALL			= libpcap-$(LIBPCAP_VERSION).tar.gz
+LIBPCAP_VERSION		= 1.10.4
+LIBPCAP_TARBALL		= libpcap-$(LIBPCAP_VERSION).tar.gz
 LIBPCAP_TARBALL_URLS	+= $(ONIE_MIRROR) \
 			   https://www.tcpdump.org/release
 LIBPCAP_BUILD_DIR	=  $(USER_BUILDDIR)/libpcap
@@ -91,7 +91,7 @@ libpcap-install: $(LIBPCAP_INSTALL_STAMP)
 $(LIBPCAP_INSTALL_STAMP): $(SYSROOT_INIT_STAMP) $(LIBPCAP_BUILD_STAMP)
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "==== Installing libpcap in $(SYSROOTDIR) ===="
-	$(Q) mkdir -p $(SYSROSYSROOTDIROT)/usr/lib/
+	$(Q) mkdir -p $(SYSROOTDIR)/usr/lib/
 	$(Q) cp -av $(DEV_SYSROOT)/usr/lib/libpcap.so $(SYSROOTDIR)/usr/lib/
 	$(Q) cp -av $(DEV_SYSROOT)/usr/lib/libpcap.so.1 $(SYSROOTDIR)/usr/lib/
 	$(Q) cp -av $(DEV_SYSROOT)/usr/lib/libpcap.so.$(LIBPCAP_VERSION) $(SYSROOTDIR)/usr/lib/
diff --git a/build-config/make/openssl.make b/build-config/make/openssl.make
index 796db56b9..6591df9fc 100644
--- a/build-config/make/openssl.make
+++ b/build-config/make/openssl.make
@@ -10,7 +10,7 @@
 # This is a makefile fragment that defines the build of openssl
 #
 
-OPENSSL_VERSION		= 1.1.1g
+OPENSSL_VERSION		?= 1.1.1g
 OPENSSL_TARBALL		= openssl-$(OPENSSL_VERSION).tar.gz
 OPENSSL_TARBALL_URLS	+= $(ONIE_MIRROR) \
 			   https://www.openssl.org/source
@@ -31,10 +31,26 @@ PHONY += openssl openssl-download openssl-source \
 	 openssl-configure openssl-build openssl-install openssl-clean \
 	 openssl-download-clean
 
+ifeq ($(OPENSSL_VERSION),1.1.1g)
+OPENSSL_ARCH	=
 OPENSSL_LIBS	= \
 	engines-1.1 \
 	libcrypto.so libcrypto.so.1.1 \
 	libssl.so libssl.so.1.1
+else ifeq ($(OPENSSL_VERSION),3.4.0)
+ifeq ($(ARCH),arm64)
+OPENSSL_ARCH	= linux-aarch64
+else
+OPENSSL_ARCH	= linux-$(ARCH)
+endif
+
+OPENSSL_LIBS	= \
+	engines \
+	libcrypto.so libcrypto.so.3 \
+	libssl.so libssl.so.3
+else
+  $(error OPENSSL_LIBS: Unsupported OpenSSL version: $(OPENSSL_VERSION))
+endif
 
 OPENSSL_BINS	= openssl
 
@@ -63,7 +79,9 @@ $(OPENSSL_CONFIGURE_STAMP): $(OPENSSL_SOURCE_STAMP) $(ZLIB_BUILD_STAMP) \
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "====  Configure openssl-$(OPENSSL_VERSION) ===="
 	$(Q) cd $(OPENSSL_DIR) && PATH='$(CROSSBIN):$(PATH)'	\
+		MACHINE=$(TARGET) RELEASE=$(LINUX_RELEASE)	\
 		$(OPENSSL_DIR)/config				\
+		$(OPENSSL_ARCH)					\
 		--prefix=/usr					\
 		--cross-compile-prefix=$(CROSSPREFIX)		\
 		shared						\
diff --git a/upstream/openssl-3.4.0.tar.gz.sha1 b/upstream/openssl-3.4.0.tar.gz.sha1
new file mode 100644
index 000000000..f1559a293
--- /dev/null
+++ b/upstream/openssl-3.4.0.tar.gz.sha1
@@ -0,0 +1 @@
+5c2f33c3f3601676f225109231142cdc30d44127  openssl-3.4.0.tar.gz