diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e3267853d37..0f601bdbf07 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-02  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* riscv-tdep.c (riscv_register_aliases): Swap "fp" and "s0" entries.
+
 2018-06-29  Joel Brobecker  <brobecker@adacore.com>
 
 	* amd64-darwin-tdep.c (x86_darwin_init_abi_64): Add missing
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 154567136eb..4c68ef73fc5 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -128,8 +128,8 @@ static const struct register_alias riscv_register_aliases[] =
   { "t0", 5 },
   { "t1", 6 },
   { "t2", 7 },
-  { "fp", 8 },
   { "s0", 8 },
+  { "fp", 8 },
   { "s1", 9 },
   { "a0", 10 },
   { "a1", 11 },