diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 70ba8f0aae91..bce2539c49eb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -86,6 +86,7 @@ config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
+config/boards/odroidc1.csc		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
@@ -160,7 +161,7 @@ config/kernel/linux-arm64-*.config		@FantasyGmm
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-imx8m-*.config		@schmiedelm
 config/kernel/linux-k3-*.config		@glneo
-config/kernel/linux-meson-*.config		@hzyitc
+config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
@@ -185,7 +186,7 @@ patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/imx8m-*/		@schmiedelm
 patch/kernel/k3-*/		@glneo
-patch/kernel/meson-*/		@hzyitc
+patch/kernel/meson-*/		@hzyitc @juanlufont
 patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
@@ -203,7 +204,7 @@ sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
 sources/families/k3.conf		@glneo
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
-sources/families/meson.conf		@hzyitc
+sources/families/meson.conf		@hzyitc @juanlufont
 sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
diff --git a/config/boards/odroidc1.csc b/config/boards/odroidc1.conf
similarity index 96%
rename from config/boards/odroidc1.csc
rename to config/boards/odroidc1.conf
index 2f75e9569168..786428d5ece0 100644
--- a/config/boards/odroidc1.csc
+++ b/config/boards/odroidc1.conf
@@ -1,7 +1,7 @@
 # Amlogic S805 C1 quad core 1GB RAM SoC GBE
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="juanlufont"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"