diff --git a/packages/textproc/libiconv/package.mk b/packages/textproc/libiconv/package.mk
index 127e24f27..398f33c55 100644
--- a/packages/textproc/libiconv/package.mk
+++ b/packages/textproc/libiconv/package.mk
@@ -2,23 +2,21 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libiconv"
-PKG_VERSION="1.15"
-PKG_SHA256="ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
+PKG_VERSION="1.17"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A tool that converts from one character encoding to another through Unicode conversion."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_TARGET="--host=$TARGET_NAME \
-            --build=$HOST_NAME \
+PKG_CONFIGURE_OPTS_TARGET="--host=${TARGET_NAME} \
+            --build=${HOST_NAME} \
             --prefix=/usr \
             --includedir=/usr/include/iconv \
             --libdir=/usr/lib/iconv \
             --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
+            --enable-shared \
+            --disable-statuc \
             --disable-nls \
-            --disable-extra-encodings \
             --with-gnu-ld"
diff --git a/packages/tools/sysutils/git/package.mk b/packages/tools/sysutils/git/package.mk
index a44b00387..b7edc0f7e 100644
--- a/packages/tools/sysutils/git/package.mk
+++ b/packages/tools/sysutils/git/package.mk
@@ -2,13 +2,11 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 
 PKG_NAME="git"
-PKG_VERSION="2.21.0"
-PKG_SHA256="85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee"
-PKG_REV="1"
+PKG_VERSION="2.39.0"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://git-scm.com/"
-PKG_URL="https://mirrors.edge.kernel.org/pub/software/scm/git/git-$PKG_VERSION.tar.gz"
+PKG_URL="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl pcre curl libiconv zlib"
 PKG_SECTION="emuelec"
 PKG_SHORTDESC="Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. "
@@ -17,19 +15,16 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_fread_reads_directories=yes \
-                           ac_cv_snprintf_returns_bogus=yes"
-                           
+                           ac_cv_snprintf_returns_bogus=yes \
+                           ac_cv_iconv_omits_bom=yes"                          
+ 
 pre_configure_target() {
  cd ..
- rm -rf .$TARGET_NAME
+ rm -rf .${TARGET_NAME}
 }
 
 make_target() {
- cd $PKG_BUILD
+ cd ${PKG_BUILD}
  make git
 }
 
-makeinstall_target() { 
-mkdir -p $INSTALL/usr/bin
-cp git $INSTALL/usr/bin
-}