diff --git a/firmware_configurations/README.md b/firmware_configurations/README.md
index 41cc7662e..1a4a2970b 100644
--- a/firmware_configurations/README.md
+++ b/firmware_configurations/README.md
@@ -27,7 +27,7 @@ like so:
 
 | Creator | Config title | Description | V0 | V1.8 | V2.4 | VSW |
 | --- | --- | --- | --- | --- | --- | --- |
-|   |  |  |  |  |  |  |
+| revnull | [BTT Octopus Board Pins](./klipper/revnull/btt_octopus_pins) | Defines a set of `[board_pins]` aliases for use with the BTT Octopus controller | :grey_question: | :grey_question: | :heavy_check_mark: | :grey_question: |
 
 ---
 
diff --git a/firmware_configurations/klipper/revnull/btt_octopus_pins/README.md b/firmware_configurations/klipper/revnull/btt_octopus_pins/README.md
new file mode 100644
index 000000000..10bf0c4c1
--- /dev/null
+++ b/firmware_configurations/klipper/revnull/btt_octopus_pins/README.md
@@ -0,0 +1,8 @@
+BTT Octopus Pin Aliases
+=========
+
+This file defines a set of pin aliases for the [Bigtreetech Octopus](https://github.com/bigtreetech/BIGTREETECH-OCTOPUS-V1.0) controller. This can make setting up your Klipper config easier by using familiar names instead of odd MCU pin IDs.
+
+## Installation:
+You can either copy the contents of this config to you printer.cfg add it as a separate file and import it using:
+`[include btt_octopus_pin_aliases.cfg]`
\ No newline at end of file
diff --git a/firmware_configurations/klipper/revnull/btt_octopus_pins/btt_octopus_pin_aliases.cfg b/firmware_configurations/klipper/revnull/btt_octopus_pins/btt_octopus_pin_aliases.cfg
new file mode 100644
index 000000000..2182d637d
--- /dev/null
+++ b/firmware_configurations/klipper/revnull/btt_octopus_pins/btt_octopus_pin_aliases.cfg
@@ -0,0 +1,79 @@
+#####################################################################
+#   BTT Octopus Pin Aliases
+#####################################################################
+
+[board_pins]
+aliases:
+    # Stepper drivers
+    MOT0_EN=PF14, MOT0_STEP=PF13, MOT0_DIR=PF12, MOT0_CS=PC4,   # MOTOR0
+    MOT1_EN=PF15, MOT1_STEP=PG0,  MOT1_DIR=PG1,  MOT1_CS=PD11,  # MOTOR1
+    MOT2_EN=PG5,  MOT2_STEP=PF11, MOT2_DIR=PG3,  MOT2_CS=PC6,   # MOTOR2
+    MOT3_EN=PA0,  MOT3_STEP=PG4,  MOT3_DIR=PC1,  MOT3_CS=PC7,   # MOTOR3
+    MOT4_EN=PG2,  MOT4_STEP=PF9,  MOT4_DIR=PF10, MOT4_CS=PF2,   # MOTOR4
+    MOT5_EN=PF1,  MOT5_STEP=PC13, MOT5_DIR=PF0,  MOT5_CS=PE4,   # MOTOR5
+    MOT6_EN=PD4,  MOT6_STEP=PE2,  MOT6_DIR=PE3,  MOT6_CS=PE1,   # MOTOR6
+    MOT7_EN=PE0,  MOT7_STEP=PE6,  MOT7_DIR=PA14, MOT7_CS=PD3,   # MOTOR7
+
+    # Heaters
+    BED_OUT=PA1,
+    HE0=PA2, HE1=PA3, HE2=PB10, HE3=PB11,
+
+    # Thermisors
+    TB=PF3, T0=PF4, T1=PF5, T2=PF6, T3=PF7,
+    PT100=PF8,
+
+    # Fans
+    FAN0=PA8, FAN1=PE5, FAN2=PD12, FAN3=PD13, FAN4=PD14, FAN5=PD15,
+
+    # End stops
+    ESTOP0=PG6,  ESTOP1=PG9,  ESTOP2=PG10, ESTOP3=PG11,
+    ESTOP4=PG12, ESTOP5=PG13, ESTOP6=PG14, ESTOP7=PG15,
+
+    # EXP1
+    EXP1_1=PE8,   EXP1_2=PE7,
+    EXP1_3=PE9,   EXP1_4=PE10,
+    EXP1_5=PE12,  EXP1_6=PE13,    # Slot in the socket on this side
+    EXP1_7=PE14,  EXP1_8=PE15,
+    EXP1_9=<GND>, EXP1_10=<5V>,
+
+    # EXP2
+    EXP2_1=PA6,   EXP2_2=PA5,
+    EXP2_3=PB1,   EXP2_4=PA4,
+    EXP2_5=PB2,   EXP2_6=PA7,     # Slot in the socket on this side
+    EXP2_7=PC15,  EXP2_8=<RST>,
+    EXP2_9=<GND>, EXP2_10=<5V>,
+
+    # TFT
+    TFT_5=<RST>,
+    TFT_4=PA10,
+    TFT_3=PA9,
+    TFT_2=<GND>,
+    TFT_1=<5V>,
+
+    # Inductive Probe
+    PRB_1=<DCV>, PRB_2=<GND>, PRB_3=PB7,
+
+    # BL Touch
+    BLT_5=<GND>,
+    BLT_4=<5V>,
+    BLT_CTL=PB6,   # BL Touch servo pin
+    BLT_2=<GND>,
+    BLT_SNSR=PB7,  # BL Touch end stop pin
+
+    # LED Control
+    NEOPXL_3=<GND>, NEOPXL_2=PB0, NEOPXL_1=<5V>,
+
+    # Raspberry Pi
+    RPI_1=<5V>,  RPI_2=<5V>,
+    RPI_3=<GND>, RPI_4=<GND>,
+    RPI_5=<GND>, RPI_6=<GND>,
+    RPI_7=<GND>, RPI_8=<GND>,
+    RPI_RX=PD6,  RPI_TX=PD5,
+
+    # SPI3
+    SPI3_2=<3V3>, SPI3_MOSI=PB5, SPI3_CS=PA15, SPI3_8=<GND>, SPI3_10=<5V>,
+    SPI3_1=<GND>, SPI3_MISO=PB4, SPI3_SCK=PB3, SPI3_7=<GND>, SPI3_9=<5V>,
+
+    # Other headers
+    POWER_DET=PC0,
+    PS_ON=PE11