diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 88005ad..e6fbce6 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,12 +1,12 @@
 if (ANDROID)
     set(fileName ${CMAKE_BINARY_DIR}/kirogicore-android-dependencies.xml)
     file(WRITE "${fileName}" "<rules><dependencies><lib name='kirogicore'><depends>\n"
                                 "<bundled file='${KDE_INSTALL_PLUGINDIR}/kirogi/vehiclesupport' />\n"
                                 "<bundled file='${KDE_INSTALL_LIBDIR}/libQtZeroConf.so' />\n"
                              "</depends></lib></dependencies></rules>\n")
     install(FILES ${fileName} DESTINATION ${KDE_INSTALL_LIBDIR})
 endif()
 
-#add_subdirectory(mavlink)
+add_subdirectory(mavlink)
 add_subdirectory(parrot)
 add_subdirectory(ryzetello)
diff --git a/src/plugins/mavlink/CMakeLists.txt b/src/plugins/mavlink/CMakeLists.txt
index 63f3bc0..53ec127 100644
--- a/src/plugins/mavlink/CMakeLists.txt
+++ b/src/plugins/mavlink/CMakeLists.txt
@@ -1,47 +1,54 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kirogimavlinkplugin\")
 
+find_package(MAVLink)
+
+if(MAVLink_FOUND)
+    message(STATUS "MAVLink found: Kirogi will build with MAVLink integration.")
+else()
+    message(WARNING "MAVLink not found.")
+    return()
+endif()
+
 set(kirogimavlinkplugin_SRCS
     mavlinkconnection.cpp
     mavlinkplugin.cpp
     mavlinkvehicle.cpp
 )
 
 ecm_qt_declare_logging_category(kirogimavlinkplugin_SRCS
     HEADER debug.h
     IDENTIFIER KIROGI_VEHICLESUPPORT_MAVLINK
     CATEGORY_NAME "kirogi.vehiclesupport.mavlink"
 )
 
 kcoreaddons_add_plugin(kirogimavlinkplugin
     SOURCES ${kirogimavlinkplugin_SRCS}
     JSON "${CMAKE_CURRENT_SOURCE_DIR}/kirogimavlinkplugin.json"
     INSTALL_NAMESPACE "kirogi/vehiclesupport"
 )
 
-find_package(MAVLink REQUIRED)
-
 include_directories(
     ${MAVLINK_INCLUDE_DIR}
     ${MAVLINK_INCLUDE_DIR}/ardupilotmega
 )
 
 set_target_properties(kirogimavlinkplugin
     PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
 )
 
 target_link_libraries(kirogimavlinkplugin
     PRIVATE
         Qt5::Core
         Qt5::Network
         Qt5::Positioning
         KF5::CoreAddons
         KF5::I18n
         KirogiCore
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options(kirogimavlinkplugin PRIVATE -pedantic)
 endif()
 
 install(FILES kirogimavlinkplugin.categories DESTINATION ${KDE_INSTALL_CONFDIR})