diff --git a/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch b/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch
deleted file mode 100644
index 7b6cba2..0000000
--- a/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c10a77eb..b7769c5b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -50,7 +50,7 @@ endif()
- include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
- add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\")
- 
--if(WIN32)
-+if(WIN32 OR MINGW)
-     set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
-     set(EXTRA_WINDOWS_LIBRARIES setupapi hid ws2_32)
- endif()
-@@ -112,7 +112,7 @@ endif()
- 
- configure_file(cmake_config.h.in ac_cfg.h)
- configure_file(avrdude.spec.in avrdude.spec)
--if(WIN32)
-+if(WIN32 OR MINGW)
-     configure_file(windows.rc.in windows.rc)
- endif()
- 
diff --git a/patches/0008-Append-arduino-to-version-string.patch b/patches/0008-Append-arduino-to-version-string.patch
index dd16544..78d5b11 100644
--- a/patches/0008-Append-arduino-to-version-string.patch
+++ b/patches/0008-Append-arduino-to-version-string.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ab5a832..c3b5d8a8 100644
+index 431eda87..ff8d678f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -49,7 +49,7 @@ include(FindPackageMessage)
@@ -20,16 +20,3 @@ index 9ab5a832..c3b5d8a8 100644
      endif()
  endif()
  
-diff --git a/src/configure.ac b/src/configure.ac
-index 4b8425f0..2282ed74 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -23,7 +23,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.60)
--AC_INIT(avrdude, 7.2, avrdude-dev@nongnu.org)
-+AC_INIT(avrdude, ARDUINO_VERSION_PLACEHOLDER, avrdude-dev@nongnu.org)
- 
- AC_CANONICAL_BUILD
- AC_CANONICAL_HOST