diff --git a/modules/obsolete-options.nix b/modules/obsolete-options.nix
new file mode 100644
index 0000000..4c39aff
--- /dev/null
+++ b/modules/obsolete-options.nix
@@ -0,0 +1,28 @@
+{ lib, ... }:
+
+with lib;
+let
+  mkRenamedAnnounceTorOption = service:
+    # use mkRemovedOptionModule because mkRenamedOptionModule fails with an infinite recursion error
+    mkRemovedOptionModule [ "services" service "announce-tor" ] ''
+      Use option `nix-bitcoin.onionServices.${service}.public` instead.
+    '';
+in {
+  imports = [
+    (mkRenamedOptionModule [ "services" "bitcoind" "bind" ] [ "services" "bitcoind" "address" ])
+    (mkRenamedOptionModule [ "services" "bitcoind" "rpcallowip" ] [ "services" "bitcoind" "rpc" "allowip" ])
+    (mkRenamedOptionModule [ "services" "bitcoind" "rpcthreads" ] [ "services" "bitcoind" "rpc" "threads" ])
+    (mkRenamedOptionModule [ "services" "clightning" "bind-addr" ] [ "services" "clightning" "address" ])
+    (mkRenamedOptionModule [ "services" "clightning" "bindport" ] [ "services" "clightning" "port" ])
+    (mkRenamedOptionModule [ "services" "spark-wallet" "host" ] [ "services" "spark-wallet" "address" ])
+    (mkRenamedOptionModule [ "services" "lnd" "rpclisten" ] [ "services" "lnd" "rpcAddress" ])
+    (mkRenamedOptionModule [ "services" "lnd" "listen" ] [ "services" "lnd" "address" ])
+    (mkRenamedOptionModule [ "services" "lnd" "listenPort" ] [ "services" "lnd" "port" ])
+    (mkRenamedOptionModule [ "services" "btcpayserver" "bind" ] [ "services" "btcpayserver" "address" ])
+    (mkRenamedOptionModule [ "services" "liquidd" "bind" ] [ "services" "liquidd" "address" ])
+    (mkRenamedOptionModule [ "services" "liquidd" "rpcbind" ] [ "services" "liquidd" "rpc" "address" ])
+
+    (mkRenamedAnnounceTorOption "clightning")
+    (mkRenamedAnnounceTorOption "lnd")
+  ];
+}
diff --git a/modules/versioning.nix b/modules/versioning.nix
index f811779..3803c86 100644
--- a/modules/versioning.nix
+++ b/modules/versioning.nix
@@ -76,6 +76,10 @@ let
   lastChange = builtins.elemAt changes (builtins.length changes - 1);
 in
 {
+  imports = [
+    ./obsolete-options.nix
+  ];
+
   options = {
     nix-bitcoin.configVersion = mkOption {
       type = with types; nullOr str;