diff --git a/CHANGES.rst b/CHANGES.rst
index c17f9cc3b..a3d2a5907 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,9 @@ Bug fixes in 0.5.0
 - Fixed a bug where using ``labgrid-client io get`` always returned ``low``
   when reading a ``sysfsgpio``.
 - Fix labgrid-client exit code on keyboard interrupt.
+- Fixed ``labgrid-client forward --remote``/``-R``, which used either the LOCAL
+  part of ``--local``/``-L`` accidentally (if specified) or raised an
+  UnboundLocalError.
 
 Breaking changes in 0.5.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/labgrid/remote/client.py b/labgrid/remote/client.py
index 3aec145eb..00519bc17 100755
--- a/labgrid/remote/client.py
+++ b/labgrid/remote/client.py
@@ -1121,7 +1121,7 @@ def forward(self):
                 print(f"Forwarding local port {localport:d} to remote port {remote:d}")
 
             for local, remote in self.args.remote:
-                stack.enter_context(drv.forward_remote_port(remote, localport))
+                stack.enter_context(drv.forward_remote_port(remote, local))
                 print(f"Forwarding remote port {remote:d} to local port {local:d}")
 
             try: