diff --git a/.git-lfs.metadata b/.git-lfs.metadata
index c49629f..1eae6b2 100644
--- a/.git-lfs.metadata
+++ b/.git-lfs.metadata
@@ -1 +1 @@
-e76897da8f89170b2e23db7723408a7bdd038ee8 SOURCES/git-lfs-v3.4.1.tar.gz
+771dcd1c97f61e93a8f362a7d5082469ac52a3bf SOURCES/git-lfs-v3.6.1.tar.gz
diff --git a/.gitignore b/.gitignore
index 92e0b08..d8e1fcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/git-lfs-v3.4.1.tar.gz
+SOURCES/git-lfs-v3.6.1.tar.gz
diff --git a/SPECS/git-lfs.spec b/SPECS/git-lfs.spec
index e121507..f0cdf6a 100644
--- a/SPECS/git-lfs.spec
+++ b/SPECS/git-lfs.spec
@@ -1,8 +1,8 @@
 %bcond_without check
 
 # https://github.com/git-lfs/git-lfs
-%global goipath         github.com/git-lfs/git-lfs
-Version:                3.4.1
+%global goipath         github.com/git-lfs/git-lfs/v3
+Version:                3.6.1
 
 %gometa
 
@@ -29,31 +29,32 @@ Provides:       bundled(golang(github.com/git-lfs/go-netrc)) = f0c862d
 Provides:       bundled(golang(github.com/git-lfs/pktline)) = 06e9096
 Provides:       bundled(golang(github.com/git-lfs/wildmatch/v2)) = 2.0.1
 Provides:       bundled(golang(github.com/hashicorp/go-uuid)) = 1.0.2
-Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.1
+Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0
 Provides:       bundled(golang(github.com/jcmturner/aescts/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/dnsutils/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/gofork)) = 1.0.0
 Provides:       bundled(golang(github.com/jcmturner/goidentity/v6)) = 6.0.1
 Provides:       bundled(golang(github.com/jcmturner/gokrb5/v8)) = 8.4.2
 Provides:       bundled(golang(github.com/jcmturner/rpc/v2)) = 2.0.3
+Provides:       bundled(golang(github.com/jmhodges/clock)) = 1.2.0
 Provides:       bundled(golang(github.com/leonelquinteros/gotext)) = 1.5.0
 Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.4
 Provides:       bundled(golang(github.com/olekukonko/ts)) = 78ecb04
 Provides:       bundled(golang(github.com/pkg/errors)) = c605e28
 Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
 Provides:       bundled(golang(github.com/rubyist/tracerx)) = 7879593
-Provides:       bundled(golang(github.com/spf13/cobra)) = 1.6.0
+Provides:       bundled(golang(github.com/spf13/cobra)) = 1.7.0
 Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.5
 Provides:       bundled(golang(github.com/ssgelm/cookiejarparser)) = 1.0.1
 Provides:       bundled(golang(github.com/stretchr/testify)) = 1.6.1
 Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac27
 Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7b
 Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3f
-Provides:       bundled(golang(golang.org/x/crypto)) = 7b82a4e
-Provides:       bundled(golang(golang.org/x/net)) = 0.7.0
+Provides:       bundled(golang(golang.org/x/crypto)) = 0.21.0
+Provides:       bundled(golang(golang.org/x/net)) = 0.23.0
 Provides:       bundled(golang(golang.org/x/sync)) = 0.1.0
-Provides:       bundled(golang(golang.org/x/sys)) = 0.5.0
-Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
+Provides:       bundled(golang(golang.org/x/sys)) = 0.18.0
+Provides:       bundled(golang(golang.org/x/text)) = 0.14.0
 Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 
 
@@ -91,6 +92,10 @@ sed -i -e 's!^BINPATH=.\+!BINPATH="%{gobuilddir}/bin"!g' t/testenv.sh
 export GOPATH=%{gobuilddir}:%{gopath}
 export GO111MODULE=off
 
+# Enable FIPS support at build time by enabling CGO and enforcing strict FIPS runtime
+export CGO_ENABLED=1
+export GOEXPERIMENT=strictfipsruntime
+
 # Build manpages first (some embedding in the executable is done.)
 make man GIT_LFS_SHA=unused VERSION=unused PREFIX=unused
 pushd docs
@@ -151,6 +156,22 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 
 
 %changelog
+* Wed Jan 15 2025 Ondřej Pohořelský <opohorel@redhat.com> - 3.6.1-1
+- Update to 3.6.1
+- Resolves: RHEL-73940
+
+* Thu Nov 28 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+- Resolves: RHEL-63968, RHEL-61045, RHEL-47219, RHEL-43318, RHEL-35936, RHEL-2791
+
+* Wed Aug 07 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-3
+- Make Git-LFS FIPS compliant
+- Resolves: RHEL-53086
+
+* Wed May 22 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-2
+- Rebuild with new Golang
+- Resolves: RHEL-32571
+
 * Mon Dec 18 2023 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-1
 - Update to 3.4.1
 - Resolves: RHEL-17101