diff --git a/Formula/s/stlink.rb b/Formula/s/stlink.rb
index f7b9496d1edb..a4d023ba068b 100644
--- a/Formula/s/stlink.rb
+++ b/Formula/s/stlink.rb
@@ -1,31 +1,37 @@
 class Stlink < Formula
   desc "STM32 discovery line Linux programmer"
   homepage "https://github.com/stlink-org/stlink"
-  url "https://github.com/stlink-org/stlink/archive/refs/tags/v1.7.0.tar.gz"
-  sha256 "57ec1214905aedf59bee7f70ddff02316f64fa9ba5a9b6a3a64952edc5b65855"
+  url "https://github.com/stlink-org/stlink/archive/refs/tags/v1.8.0.tar.gz"
+  sha256 "cff760b5c212c2cc480f705b9ca7f3828d6b9c267950c6a547002cd0a1f5f6ac"
   license "BSD-3-Clause"
   head "https://github.com/stlink-org/stlink.git", branch: "develop"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "0fbf4050373180e7d9510579c77d836b48033b9b06e89a34156b777b38e5dd58"
-    sha256 cellar: :any,                 arm64_ventura:  "37bc6182a2709fbcd5046be4c1cb93936475f12d2ee42983e9f7802ed89bc97c"
-    sha256 cellar: :any,                 arm64_monterey: "2ea4763e208c5566d0ec1848a6d91c440fe745287aa7a5617af635fea7707af0"
-    sha256 cellar: :any,                 arm64_big_sur:  "79683924dac821a1744cf32a96c3296eecd1668b5f2f64dbdcf570f32480459f"
-    sha256 cellar: :any,                 sonoma:         "53e58898f8926563bbf42ea5eb8cb9611a5f1afe937b9daefa54b53e3bc0a5b9"
-    sha256 cellar: :any,                 ventura:        "4aff6679ab6726e3d7a397a17de9de8972d233971907811f2113c94a4a7c7560"
-    sha256 cellar: :any,                 monterey:       "32411be4437ac85b5b9feb0fc38306af2dfc1f895ad4661c2187eb70a8420b0f"
-    sha256 cellar: :any,                 big_sur:        "9ea7be4ae1c0b91ceeb40c6df9d07ad6a5660be80043895bcf29acc47988d10d"
-    sha256 cellar: :any,                 catalina:       "e162fb37d4a7e2a0e006c5cb9beae3b86784d6a0b3d371fc33d7ed9ba2140083"
-    sha256 cellar: :any,                 mojave:         "f112f45203b8c460da03ae840529d4564a677d0621ac0a9576bac510258a9ef5"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "141e0873ed4745b1224f6996f5dac5461f27a87e17d36a9f56a080f27a922f23"
+    sha256 arm64_sonoma:   "182146c51940a4851235c5a1e66e0a1455d5833a112537c366b68314f4280d62"
+    sha256 arm64_ventura:  "11f6ede1d7a55e0ceb814ea59df7e88560f317fd9ed9d1bf47c9905bb1b28b68"
+    sha256 arm64_monterey: "5aec98fdb4a07aa5abfd1292ec15bf9c385869845fc107c905f35baf2c21bb75"
+    sha256 sonoma:         "123d84cd6f2bdeeabce247febb96aed963876789e3e23bec7312098b2590483c"
+    sha256 ventura:        "96b6ee1f313c0b377a3882eb33191164b751f171dd1ba2c6c9e8ef525b663798"
+    sha256 monterey:       "5c33e3d172d272295fa0d27e08d80fd86e0429156e44b72b934898c11d08ab11"
+    sha256 x86_64_linux:   "7872c14d351e27c5953bc0565d4eb64312d3e54abc898b05197af8a631abab2c"
   end
 
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
   depends_on "libusb"
 
+  # upstream PR ref, https://github.com/stlink-org/stlink/pull/1373
+  patch do
+    url "https://github.com/stlink-org/stlink/commit/4eafbb29d106b32221c8d3b375b31d78f07de182.patch?full_index=1"
+    sha256 "a745b3f10eb9c831838afc53e94038f61b29cdbe70970d3417d15f0db5301791"
+  end
+  patch do
+    url "https://github.com/stlink-org/stlink/commit/d742e752d896c0f8d4a61b282457401f7a681b16.patch?full_index=1"
+    sha256 "1f86ccdcb6bbf2d8cf53d6c96e76c1f11aef83c9de0e8dbe9b8d5cafab02c28d"
+  end
+
   def install
-    args = std_cmake_args
+    args = []
 
     libusb = Formula["libusb"]
     args << "-DLIBUSB_INCLUDE_DIR=#{libusb.opt_include}/libusb-#{libusb.version.major_minor}"
@@ -35,8 +41,12 @@ def install
       args << "-DSTLINK_MODPROBED_DIR=#{lib}/modprobe.d"
       args << "-DSTLINK_UDEV_RULES_DIR=#{lib}/udev/rules.d"
     end
-    system "cmake", ".", *args
-    system "make", "install"
+
+    args << "-DCMAKE_INSTALL_RPATH=#{rpath}"
+
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
   end
 
   test do