diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index 970d02e..320c1f3 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -25,6 +25,17 @@ CFLAGS+=-DI2C_SMBUS=I2C_4
 # Set touchpad PS2 bus
 CFLAGS+=-DPS2_TOUCHPAD=PS2_3
 
+# Custom fan curve
+CLFAGS+=-DBOARD_HEATUP=5
+CFLAGS+=-DBOARD_COOLDOWN=20
+CFLAGS+=-DBOARD_FAN_POINTS="\
+	FAN_POINT(65, 40), \
+	FAN_POINT(70, 60), \
+	FAN_POINT(75, 75), \
+	FAN_POINT(80, 90), \
+	FAN_POINT(85, 100) \
+"
+
 # Set smart charger parameters
 CFLAGS+=\
 	-DCHARGER_CHARGE_CURRENT=1536 \
diff --git a/src/board/system76/oryp6/dgpu.c b/src/board/system76/oryp6/dgpu.c
index 916c748..7b16e42 100644
--- a/src/board/system76/oryp6/dgpu.c
+++ b/src/board/system76/oryp6/dgpu.c
@@ -32,11 +32,11 @@ struct FanPoint {
 
 // Fan curve with temperature in degrees C, duty cycle in percent
 static struct FanPoint __code FAN_POINTS[] = {
-    FAN_POINT(70, 40),
-    FAN_POINT(75, 50),
-    FAN_POINT(80, 60),
-    FAN_POINT(85, 65),
-    FAN_POINT(90, 65)
+    FAN_POINT(65, 40),
+    FAN_POINT(70, 60),
+    FAN_POINT(75, 75),
+    FAN_POINT(80, 90),
+    FAN_POINT(85, 100)
 };
 
 // Get duty cycle based on temperature, adapted from