diff --git a/src/main.cpp b/src/main.cpp
index d88b60e..dc8e5ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,6 @@
 #include <Arduino.h>
 #include <ESP8266WiFi.h>
+#include <ArduinoOTA.h>
 #include "my_fastled.h"
 #include "config.h"
 #include "tools.h"
@@ -109,6 +110,8 @@ void setup() {
 
 		wifi_setup();
 		mqtt_setup();
+		ArduinoOTA.setHostname(OTA_HOSTNAME);
+		ArduinoOTA.begin();
 	#endif
 	
 }
@@ -129,6 +132,8 @@ void loop() {
 	#else
 		// Normal mode
 		mqtt_loop();
+		ArduinoOTA.handle();
+
 		EVERY_N_MILLISECONDS(20 / SPEEDUP) {
 			looping = false;