diff --git a/devel/sdbus-cpp/Makefile b/devel/sdbus-cpp/Makefile
index 3a0eee41935d..6027d410c826 100644
--- a/devel/sdbus-cpp/Makefile
+++ b/devel/sdbus-cpp/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	sdbus-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	High-level C++ D-Bus library
 WWW=		https://github.com/Kistler-Group/sdbus-cpp
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbasu.so:devel/basu \
 		libexpat.so:textproc/expat2
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	Kistler-Group
 CMAKE_ON=	BUILD_CODE_GEN
 CMAKE_OFF=	BUILD_DOC
 CMAKE_TESTING_ON=	BUILD_TESTS
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1300134
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 CFLAGS+=	`pkg-config --cflags epoll-shim`
 LDFLAGS+=	`pkg-config --libs epoll-shim`
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/sdbus-cpp/files/patch-basu b/devel/sdbus-cpp/files/patch-basu
index b31aa3a37623..6688ad309939 100644
--- a/devel/sdbus-cpp/files/patch-basu
+++ b/devel/sdbus-cpp/files/patch-basu
@@ -1,213 +1,224 @@
 libsystemd is Linux-only, so replace with basu
 
 --- CMakeLists.txt.orig	2021-12-22 12:17:31 UTC
 +++ CMakeLists.txt
 @@ -16,7 +16,7 @@ option(BUILD_LIBSYSTEMD "Build libsystemd static libra
  
  if(NOT BUILD_LIBSYSTEMD)
      find_package(PkgConfig REQUIRED)
 -    pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236)
 +    pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
      if(NOT TARGET PkgConfig::Systemd)
          message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found "
                              "(if you have systemd in your OS, you may want to install package containing pkgconfig "
 @@ -25,8 +25,7 @@ if(NOT BUILD_LIBSYSTEMD)
                              "and incorporate libsystemd as embedded library within sdbus-c++)")
      endif()
      add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd)
 -    string(REGEX MATCHALL "([0-9]+)" SYSTEMD_VERSION_LIST "${Systemd_VERSION}")
 -    list(GET SYSTEMD_VERSION_LIST 0 LIBSYSTEMD_VERSION)
 +    set(LIBSYSTEMD_VERSION "239")
      message(STATUS "Building with libsystemd v${LIBSYSTEMD_VERSION}")
  else()
      # Build static libsystemd library as an external project
+--- pkgconfig/sdbus-c++.pc.in.orig	2021-10-25 07:02:37 UTC
++++ pkgconfig/sdbus-c++.pc.in
+@@ -5,7 +5,7 @@ Description: C++ library on top of sd-bus, a systemd D
+ 
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires: libsystemd
++Requires: basu
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
 --- src/Connection.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Connection.cpp
 @@ -30,7 +30,7 @@
  #include <sdbus-c++/Message.h>
  #include <sdbus-c++/Error.h>
  #include "ScopeGuard.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <unistd.h>
  #include <poll.h>
  #include <sys/eventfd.h>
 --- src/Connection.h.orig	2021-10-25 07:02:37 UTC
 +++ src/Connection.h
 @@ -32,7 +32,7 @@
  #include "IConnection.h"
  #include "ScopeGuard.h"
  #include "ISdBus.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <memory>
  #include <thread>
  #include <string>
 --- src/Error.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Error.cpp
 @@ -25,7 +25,7 @@
   */
  
  #include <sdbus-c++/Error.h>
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include "ScopeGuard.h"
  
  namespace sdbus
 --- src/Flags.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Flags.cpp
 @@ -25,7 +25,7 @@
   */
  
  #include <sdbus-c++/Flags.h>
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  
  namespace sdbus
  {
 --- src/IConnection.h.orig	2022-08-09 07:50:33 UTC
 +++ src/IConnection.h
 @@ -28,7 +28,7 @@
  #define SDBUS_CXX_INTERNAL_ICONNECTION_H_
  
  #include <sdbus-c++/IConnection.h>
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <string>
  #include <memory>
  #include <functional>
 --- src/ISdBus.h.orig	2021-10-25 07:02:37 UTC
 +++ src/ISdBus.h
 @@ -28,7 +28,7 @@
  #ifndef SDBUS_CXX_ISDBUS_H
  #define SDBUS_CXX_ISDBUS_H
  
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  
  namespace sdbus::internal {
  
 --- src/Message.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Message.cpp
 @@ -31,7 +31,7 @@
  #include "ISdBus.h"
  #include "IConnection.h"
  #include "ScopeGuard.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <cassert>
  
  namespace sdbus {
 --- src/Object.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Object.cpp
 @@ -34,7 +34,7 @@
  #include "ScopeGuard.h"
  #include "IConnection.h"
  #include "VTableUtils.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <utility>
  #include <cassert>
  
 --- src/Object.h.orig	2021-10-25 07:02:37 UTC
 +++ src/Object.h
 @@ -29,7 +29,7 @@
  
  #include <sdbus-c++/IObject.h>
  #include "IConnection.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <string>
  #include <map>
  #include <vector>
 --- src/Proxy.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Proxy.cpp
 @@ -31,7 +31,7 @@
  #include "sdbus-c++/IConnection.h"
  #include "sdbus-c++/Error.h"
  #include "ScopeGuard.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <cassert>
  #include <chrono>
  #include <utility>
 --- src/Proxy.h.orig	2021-10-25 07:02:37 UTC
 +++ src/Proxy.h
 @@ -29,7 +29,7 @@
  
  #include <sdbus-c++/IProxy.h>
  #include "IConnection.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <string>
  #include <memory>
  #include <map>
 --- src/SdBus.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/SdBus.cpp
 @@ -178,7 +178,8 @@ int SdBus::sd_bus_open_system(sd_bus **ret)
  
  int SdBus::sd_bus_open_system_remote(sd_bus **ret, const char *host)
  {
 -    return ::sd_bus_open_system_remote(ret, host);
 +    // Removed in https://git.sr.ht/~emersion/basu/commit/01d33b244eb6
 +    return -EOPNOTSUPP;
  }
  
  int SdBus::sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags)
 --- src/Types.cpp.orig	2021-10-25 07:02:37 UTC
 +++ src/Types.cpp
 @@ -27,7 +27,7 @@
  #include <sdbus-c++/Types.h>
  #include <sdbus-c++/Error.h>
  #include "MessageUtils.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <cassert>
  
  namespace sdbus {
 --- src/Utils.h.orig	2022-08-09 07:50:33 UTC
 +++ src/Utils.h
 @@ -28,7 +28,7 @@
  #define SDBUS_CXX_INTERNAL_UTILS_H_
  
  #include <sdbus-c++/Error.h>
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  
  #if LIBSYSTEMD_VERSION>=246
  #define SDBUS_CHECK_OBJECT_PATH(_PATH)                                                                                              \
 --- src/VTableUtils.c.orig	2021-10-25 07:02:37 UTC
 +++ src/VTableUtils.c
 @@ -25,7 +25,7 @@
   */
  
  #include "VTableUtils.h"
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  
  sd_bus_vtable createVTableStartItem(uint64_t flags)
  {
 --- src/VTableUtils.h.orig	2021-10-25 07:02:37 UTC
 +++ src/VTableUtils.h
 @@ -27,7 +27,7 @@
  #ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
  #define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
  
 -#include <systemd/sd-bus.h>
 +#include <basu/sd-bus.h>
  #include <stdbool.h>
  
  #ifdef __cplusplus
 --- tests/integrationtests/DBusStandardInterfacesTests.cpp.orig	2021-10-25 07:02:37 UTC
 +++ tests/integrationtests/DBusStandardInterfacesTests.cpp
 @@ -65,8 +65,8 @@ TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInter
      // a non-systemd Linux), org.freedesktop.DBus.Peer.GetMachineId() will not work. To solve
      // this, you can create /etc/machine-id yourself as symlink to /var/lib/dbus/machine-id,
      // and then org.freedesktop.DBus.Peer.GetMachineId() will start to work.
 -    if (::access("/etc/machine-id", F_OK) == -1)
 -        GTEST_SKIP() << "/etc/machine-id file does not exist, GetMachineId() will not work";
 +    if (::access("/var/lib/dbus/machine-id", F_OK) == -1)
 +        GTEST_SKIP() << "/var/lib/dbus/machine-id file does not exist, GetMachineId() will not work";
  
      ASSERT_NO_THROW(m_proxy->GetMachineId());
  }