diff --git a/general/package/Config.in b/general/package/Config.in
index edb9489b..6f9a2ae6 100644
--- a/general/package/Config.in
+++ b/general/package/Config.in
@@ -20,6 +20,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/ffmpeg-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/fullhan-osdrv-fh8852v100/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/fullhan-osdrv-fh8852v200/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/gdbserver-lite/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/go2rtc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/goke-osdrv-gk710x/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/goke-osdrv-gk7205v200/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/grainmedia-osdrv-gm8136/Config.in"
@@ -50,6 +51,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/lame-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libcurl-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libevent-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libhv-openipc/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/libjpeg-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libogg-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libre-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/librem-openipc/Config.in"
@@ -109,4 +111,3 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/go2rtc/Config.in"
diff --git a/general/package/libjpeg-openipc/Config.in b/general/package/libjpeg-openipc/Config.in
new file mode 100644
index 00000000..b89b6f92
--- /dev/null
+++ b/general/package/libjpeg-openipc/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_LIBJPEG_OPENIPC
+	bool "libjpeg-openipc"
+	help
+	  The ubiquitous C library for manipulating JPEG images.
+	  http://www.ijg.org/
diff --git a/general/package/libjpeg-openipc/libjpeg-openipc.mk b/general/package/libjpeg-openipc/libjpeg-openipc.mk
new file mode 100644
index 00000000..e3987c27
--- /dev/null
+++ b/general/package/libjpeg-openipc/libjpeg-openipc.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# libjpeg-openipc
+#
+################################################################################
+
+LIBJPEG_OPENIPC_VERSION = 9e
+LIBJPEG_OPENIPC_SITE = http://www.ijg.org/files
+LIBJPEG_OPENIPC_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz
+
+LIBJPEG_OPENIPC_INSTALL_STAGING = YES
+LIBJPEG_OPENIPC_LICENSE = IJG
+LIBJPEG_OPENIPC_LICENSE_FILES = README
+
+LIBJPEG_OPENIPC_CONF_OPTS = --disable-shared
+
+define LIBJPEG_OPENIPC_REMOVE_BINARIES
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom)
+endef
+
+LIBJPEG_OPENIPC_POST_INSTALL_TARGET_HOOKS += LIBJPEG_OPENIPC_REMOVE_BINARIES
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/general/package/quirc-openipc/Config.in b/general/package/quirc-openipc/Config.in
index 42b70208..796a2276 100644
--- a/general/package/quirc-openipc/Config.in
+++ b/general/package/quirc-openipc/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QUIRC_OPENIPC
 	bool "quirc-openipc"
-	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBJPEG_OPENIPC
 	help
 	  QR codes are a type of high-density matrix barcodes, and quirc is a library for extracting and decoding them from images.
 	  https://github.com/dlbeer/quirc
diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk
index 3936f29f..d12fc879 100644
--- a/general/package/quirc-openipc/quirc-openipc.mk
+++ b/general/package/quirc-openipc/quirc-openipc.mk
@@ -7,13 +7,10 @@
 QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc/archive
 QUIRC_OPENIPC_SOURCE = master.tar.gz
 
-QUIRC_OPENIPC_DEPENDENCIES = libjpeg
-LIBJPEG_CONF_OPTS = --disable-shared
-
+QUIRC_OPENIPC_DEPENDENCIES = libjpeg-openipc
 QUIRC_OPENIPC_MAKE_OPTS = \
 	CC=$(TARGET_CC) \
-	AR=$(TARGET_AR) \
-	LDFLAGS="-s"
+	AR=$(TARGET_AR)
 
 define QUIRC_OPENIPC_BUILD_CMDS
 	$(MAKE) $(QUIRC_OPENIPC_MAKE_OPTS) -C $(@D) all