diff --git a/AUTHORS b/AUTHORS
index 2d9b131352..70eadfdfe8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -125,6 +125,7 @@ Robert Starsi
 Romain Gérard
 Ryan Bigg
 sankaranarayanan
+Sascha Mayr
 Scott Pierce
 Semyon Perepelitsa
 Shane Emmons
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 519ff8fabe..ef0d780eec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Fix symbol for XPF (CFP Franc) to "F", the one used locally; "₣" (the French franc sign) moves to the alternate symbols
 - Fix `Money::Allocation.generate` converting a Rational with unlimited `to_d` precision. It now uses `Money.conversion_precision`
 - Fix `Money::Currency.reset!` keeping the cached key set, so a currency registered before the reset was still accepted by `Money::Currency.new` and raised `NoMethodError` instead of `UnknownCurrency`
 - Fix `Money::Bank::VariableExchange#import_rates` parsing `:json` with `JSON.load`, which instantiates any class named by a `json_class` key; it now uses `JSON.parse`
diff --git a/config/currency_iso.json b/config/currency_iso.json
index e13b4a605a..fb49774939 100644
--- a/config/currency_iso.json
+++ b/config/currency_iso.json
@@ -2623,9 +2623,9 @@
   "xpf": {
     "priority": 100,
     "iso_code": "XPF",
-    "name": "Cfp Franc",
-    "symbol": "₣",
-    "alternate_symbols": ["F"],
+    "name": "CFP Franc",
+    "symbol": "F",
+    "alternate_symbols": ["F CFP", "XPF", "₣"],
     "subunit": "Centime",
     "subunit_to_unit": 1,
     "symbol_first": false,