diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..9a91919
--- /dev/null
+++ b/AndroidProducts.mk
@@ -0,0 +1,20 @@
+# Copyright 2021-2022 Fairphone B.V.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/fp3_sibon.mk
+
+COMMON_LUNCH_CHOICES := \
+	fp3_sibon-user \
+	fp3_sibon-userdebug
diff --git a/device.mk b/device.mk
new file mode 100644
index 0000000..a634e61
--- /dev/null
+++ b/device.mk
@@ -0,0 +1,17 @@
+# Copyright 2021-2022 Fairphone B.V.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product-if-exists, vendor/fairphone/fp3-sibon/device-vendor.mk)
+$(call inherit-product, device/fairphone/fp3-common/device.mk)
diff --git a/fp3_sibon.mk b/fp3_sibon.mk
new file mode 100644
index 0000000..563947b
--- /dev/null
+++ b/fp3_sibon.mk
@@ -0,0 +1,20 @@
+# Copyright 2021-2022 Fairphone B.V.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/fairphone/fp3-sibon/device.mk)
+
+PRODUCT_NAME := fp3_sibon
+PRODUCT_FLAVOR := sibon
+PRODUCT_MODEL := Fairphone Sibon