diff --git a/lfs/stage1 b/lfs/stage1
index 5ad5f1107..1b448d1a4 100644
--- a/lfs/stage1
+++ b/lfs/stage1
@@ -54,4 +54,8 @@ ifeq "$(IS_64BIT)" "1"
 	ln -svf lib $(TOOLS_DIR)/lib64
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+	ln -svf . $(TOOLS_DIR)/lib/lp64d
+endif
+
 	@$(POSTBUILD)
diff --git a/lfs/stage2 b/lfs/stage2
index bacc9e031..60d161edd 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -69,6 +69,11 @@ ifeq "$(IS_64BIT)" "1"
 	ln -svf lib /usr/lib64
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+	ln -svf . /lib/lp64d
+	ln -svf . /usr/lib/lp64d
+endif
+
 	# Symlinks
 	# for this reason, stage2 rebuild will broke the iso:perl, grubbatch
 	-ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin