diff --git a/src/borg/archiver.py b/src/borg/archiver.py
index 51f9bc7ff..02377d21c 100644
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@@ -2548,6 +2548,8 @@ class Archiver:
             ('--noatime', None, 'Warning: "--noatime" has been deprecated because it is the default now.'),
             ('--nobsdflags', None, 'Warning: "--nobsdflags" has been deprecated. Use --noflags instead.'),
             ('--numeric-owner', None, 'Warning: "--numeric-owner" has been deprecated. Use --numeric-ids instead.'),
+            ('--remote-ratelimit', None, 'Warning: "--remote-ratelimit" has been deprecated. Use --upload-ratelimit instead.'),
+            ('--remote-buffer', None, 'Warning: "--remote-buffer" has been deprecated. Use --upload-buffer instead.'),
         ]
         for i, arg in enumerate(args[:]):
             for old_name, new_name, warning in deprecations:
@@ -2744,9 +2746,13 @@ class Archiver:
             add_common_option('--remote-path', metavar='PATH', dest='remote_path',
                               help='use PATH as borg executable on the remote (default: "borg")')
             add_common_option('--remote-ratelimit', metavar='RATE', dest='remote_ratelimit', type=int,
-                              help='set remote network upload rate limit in kiByte/s (default: 0=unlimited)')
+                              help='deprecated, use --upload-ratelimit')
+            add_common_option('--upload-ratelimit', metavar='RATE', dest='remote_ratelimit', type=int,
+                              help='set network upload rate limit in kiByte/s (default: 0=unlimited)')
             add_common_option('--remote-buffer', metavar='UPLOAD_BUFFER', dest='remote_buffer', type=int,
-                              help='set upload buffer size in MiB. (default: 0=no buffer)')
+                              help='deprecated, use --upload-buffer')
+            add_common_option('--upload-buffer', metavar='UPLOAD_BUFFER', dest='remote_buffer', type=int,
+                              help='set network upload buffer size in MiB. (default: 0=no buffer)')
             add_common_option('--consider-part-files', dest='consider_part_files', action='store_true',
                               help='treat part files like normal files (e.g. to list/extract them)')
             add_common_option('--debug-profile', metavar='FILE', dest='debug_profile', default=None,