diff --git a/hare.changes b/hare.changes
index b76c416..ae1a9c1 100644
--- a/hare.changes
+++ b/hare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 13 11:03:12 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Add riscv64-correct-comments.patch to fix the build on riscv64.
+
 -------------------------------------------------------------------
 Sat Feb 17 01:02:16 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
 
diff --git a/hare.spec b/hare.spec
index a0e3eb6..4a36398 100644
--- a/hare.spec
+++ b/hare.spec
@@ -27,6 +27,10 @@ URL:            https://harelang.org
 Source0:        https://git.sr.ht/~sircmpwn/hare/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Source2:        README-suse-maint.md
+# PATCH-FIX-UPSTREAM riscv64-correct-comments.patch mcepl@suse.com
+# Fixes: https://lists.sr.ht/~sircmpwn/hare-users/%3CD18FD2EPPRY2.225EG4C0M57O4@cepl.eu%3E
+# Patch-from: https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a
+Patch0:         riscv64-correct-comments.patch
 BuildRequires:  binutils
 BuildRequires:  gcc
 # Hare and the HareC compiler should have the same version
@@ -51,7 +55,7 @@ networking software, and other low-level, high
 performance tasks
 
 %prep
-%setup -q
+%autosetup -p1
 
 cat > config.mk <<-SH
 ## Install configuration
diff --git a/riscv64-correct-comments.patch b/riscv64-correct-comments.patch
new file mode 100644
index 0000000..8ad9ef7
--- /dev/null
+++ b/riscv64-correct-comments.patch
@@ -0,0 +1,25 @@
+From 80e45e4d931a6e90d999846b86471cac00d2a6d5 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Wed, 21 Feb 2024 22:05:02 +0100
+Subject: [PATCH] debug+riscv: use correct comment syntax
+
+Signed-off-by: Andreas Schwab <schwab@suse.de>
+---
+ debug/+riscv64/getfp.s | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/debug/+riscv64/getfp.s b/debug/+riscv64/getfp.s
+index 9c3698af..b822036a 100644
+--- a/debug/+riscv64/getfp.s
++++ b/debug/+riscv64/getfp.s
+@@ -1,5 +1,5 @@
+-// SPDX-License-Identifier: MPL-2.0
+-// (c) Hare authors <https://harelang.org>
++# SPDX-License-Identifier: MPL-2.0
++# (c) Hare authors <https://harelang.org>
+ 
+ .section ".text.debug.getfp","ax"
+ .global debug.getfp
+-- 
+2.43.0
+