diff --git a/makefile b/makefile
index 119ef47816e..5fb09182e9f 100644
--- a/makefile
+++ b/makefile
@@ -166,6 +166,12 @@ endif
 ifneq ($(filter powerpc,$(UNAME_P)),)
 PLATFORM := powerpc
 endif
+ifneq ($(filter riscv64%,$(UNAME_M)),)
+PLATFORM := riscv64
+endif
+ifneq ($(filter riscv64%,$(UNAME_P)),)
+PLATFORM := riscv64
+endif
 ifneq ($(filter mips64%,$(UNAME_M)),)
 ifeq ($(shell getconf LONG_BIT),64)
 PLATFORM := mips64
@@ -349,6 +355,13 @@ ifndef NOASM
 endif
 endif
 
+ifeq ($(findstring riscv64,$(UNAME)),riscv64)
+ARCHITECTURE :=
+ifndef NOASM
+	NOASM := 1
+endif
+endif
+
 # Emscripten
 ifeq ($(findstring emcc,$(CC)),emcc)
 TARGETOS := asmjs
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 7cf0396b580..ed289f73396 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1061,6 +1061,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then
 	}
 end
 
+if (_OPTIONS["PLATFORM"]=="riscv64") then
+	defines {
+		"PTR64=1",
+	}
+end
+
 if (_OPTIONS["PLATFORM"]=="mips64") then
 	defines {
 		"PTR64=1",