diff --git a/source/_integrations/minecraft_server.markdown b/source/_integrations/minecraft_server.markdown
new file mode 100644
index 00000000000..3bc9d48cad0
--- /dev/null
+++ b/source/_integrations/minecraft_server.markdown
@@ -0,0 +1,41 @@
+---
+title: Minecraft Server
+description: Instructions on how to integrate a Minecraft server into Home Assistant.
+logo: minecraft.png
+ha_release: 0.106
+ha_category: 
+  - Binary Sensor
+  - Sensor
+ha_iot_class: Local Polling
+ha_quality_scale: silver
+ha_config_flow: true
+ha_codeowners:
+  - '@elmurato'
+---
+
+Minecraft servers allow players to play the sandbox video game [Minecraft](https://www.minecraft.net) by [Mojang AB](https://www.mojang.com) online or via a local area network with other players. The `Minecraft Server` integration lets you retreive information from a Minecraft server (Java edition) within Home Assistant.
+
+<div class='note'>
+The server must be version 1.7 or higher, since older versions don't expose any information.
+</div>
+
+## Configuration via the frontend
+
+In the settings go to `Integrations`, click on the `+` sign to add an integration and click on **Minecraft Server**.
+After completing the configuration flow, the Minecraft Server integration will be available.
+
+## Binary sensors
+
+This integration provides a binary sensor for the following information from a Minecraft server:
+
+- Connection status
+
+## Sensors
+
+This integration provides sensors for the following information from a Minecraft server:
+
+- Latency time
+- Version
+- Protocol version
+- Number of online players (player names are available in state attributes)
+- Number of maximum players
diff --git a/source/images/supported_brands/minecraft.png b/source/images/supported_brands/minecraft.png
new file mode 100644
index 00000000000..0b274b8eb09
Binary files /dev/null and b/source/images/supported_brands/minecraft.png differ