diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8a495a12..40f563d6 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -274,6 +274,7 @@ video tutorials.
  - Elviss Strazdins
  - Paul Sultana
  - Nathan Sweet
+ - Ruben Sørensen
  - TTK-Bandit
  - Nuno Teixeira
  - Jared Tiala
diff --git a/README.md b/README.md
index e323c692..23cbf192 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ information on what to include when reporting a bug.
 
 ## Changelog since 3.5
 
-None.
+ - Bugfix: Fixed stale gamepad mapping data when parsing mappings
 
 
 ## Contact
diff --git a/src/input.c b/src/input.c
index f0b29c38..8f5981a9 100644
--- a/src/input.c
+++ b/src/input.c
@@ -124,6 +124,8 @@ static _GLFWmapping* findValidMapping(const _GLFWjoystick* js)
 //
 static GLFWbool parseMapping(_GLFWmapping* mapping, const char* string)
 {
+    memset(mapping, 0, sizeof(*mapping));
+
     const char* c = string;
     size_t i, length;
     struct