diff --git a/config/rootfiles/common/gdb b/config/rootfiles/common/gdb
index 0cced1090..11dc18355 100644
--- a/config/rootfiles/common/gdb
+++ b/config/rootfiles/common/gdb
@@ -80,6 +80,7 @@
 #usr/share/gdb/syscalls/netbsd.xml
 #usr/share/gdb/syscalls/ppc-linux.xml
 #usr/share/gdb/syscalls/ppc64-linux.xml
+#usr/share/gdb/syscalls/riscv-linux.xml
 #usr/share/gdb/syscalls/s390-linux.xml
 #usr/share/gdb/syscalls/s390x-linux.xml
 #usr/share/gdb/syscalls/sparc-linux.xml
@@ -98,7 +99,6 @@
 #usr/share/info/gdb.info-7
 #usr/share/info/gdb.info-8
 #usr/share/info/gdb.info-9
-#usr/share/info/stabs.info
 #usr/share/man/man1/gcore.1
 #usr/share/man/man1/gdb-add-index.1
 #usr/share/man/man1/gdb.1
diff --git a/lfs/gdb b/lfs/gdb
index 426a99226..bba92a46e 100644
--- a/lfs/gdb
+++ b/lfs/gdb
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 17.2
+VER        = 18.1
 
 THISAPP    = gdb-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3c6c893e1d26d534918fb07b64f2e5b368825a64f888171f07443c5ebed456e7c26ed223d78bf304ee5f145c6f3c08c790c993c7b955d168e2fd8e656c6e1e9a
+$(DL_FILE)_BLAKE2 = 9cf68cd96ecd1b2f51235f80f30d4024eadea7e11fe8af1cde0103176c622b770d79fde2205739fad8fe314ffecddd450626976e1897b04899027d0d88f30e1d
 
 install : $(TARGET)
 
@@ -71,14 +71,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && mkdir -pv build
-	cd $(DIR_APP)/build && \
-		../configure \
-			--prefix=/usr \
-			--sysconfdir=/etc \
-			--disable-nls \
-			--enable-tui \
-			--with-system-readline \
-			--with-python=/usr/bin/python3
+	cd $(DIR_APP)/build && ../configure \
+					--prefix=/usr \
+					--sysconfdir=/etc \
+					--disable-nls \
+					--enable-tui \
+					--with-system-readline \
+					--with-python=/usr/bin/python3
 	cd $(DIR_APP)/build && make $(MAKETUNING)
 	cd $(DIR_APP)/build && make install
 	@rm -rf $(DIR_APP)