diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix
index 081c0686dcb1..d0549942bcc9 100644
--- a/pkgs/by-name/eb/ebusd/package.nix
+++ b/pkgs/by-name/eb/ebusd/package.nix
@@ -41,14 +41,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./patches/ebusd-cmake.patch
-    # Upstream patch for gcc-13 copmpatibility:
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/john30/ebusd/commit/3384f3780087bd6b94d46bf18cdad18201ad516c.patch";
-      hash = "sha256-+wZDHjGaIhBCqhy2zmIE8Ko3uAiw8kfKx64etCqRQjM=";
-    })
   ];
 
+  preInstall = ''
+    mkdir -p $out/usr/bin
+  '';
+
   cmakeFlags = [
     "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
     "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin"
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mv $out/usr/bin $out
+    rmdir $out/usr/bin
     rmdir $out/usr
   '';
 
diff --git a/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch b/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
index 347caa88a615..23498ca39a85 100644
--- a/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
+++ b/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
@@ -1,9 +1,9 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -184,16 +184,11 @@
+@@ -179,16 +179,11 @@
  add_subdirectory(src/lib/knx)
  add_subdirectory(src/tools)
-
+ 
 -if(EXISTS "${ROOT}/etc/debian_version")
 -  install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/default/ebusd DESTINATION /etc/default/)
 -  install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/)