diff --git a/CHANGES.md b/CHANGES.md
index 8f1ee975c78..e4aa5346df9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -77,6 +77,10 @@
   `--ingore-promoted-rules` is passed on the command line and false
   otherwise (#2382, @diml)
 
+- Fix a bug in `future_syntax` where the characters `@` and `&` were
+  not distinguished in the names of binding operators (`let@` was the
+  same as `let&`) (#2376, @aalekseyev, @diml)
+
 1.10.0 (04/06/2019)
 -------------------
 
diff --git a/src/ocaml-syntax-shims/let_trail.mll b/src/ocaml-syntax-shims/let_trail.mll
index 43816e4467a..60eeaf041b1 100644
--- a/src/ocaml-syntax-shims/let_trail.mll
+++ b/src/ocaml-syntax-shims/let_trail.mll
@@ -13,7 +13,7 @@
     | '=' -> "equal"
     | '>' -> "greater"
     | '?' -> "question"
-    | '@' -> "ampersand"
+    | '@' -> "at"
     | '^' -> "circumflex"
     | '|' -> "pipe"
     | _ -> assert false