diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63ea9a8b6cb2a0db47566bea610eaa657949d384..3e1b94658af2328e1ba81cd1fd36cfa73816316c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
 
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
-	FollowMe
 	qgcunittest
 	Terrain
 )
@@ -109,8 +108,6 @@ add_library(qgc
 
 	${EXTRA_SRC}
 
-	FollowMe/FollowMe.cc
-
 	Terrain/TerrainQuery.cc
 
 	CmdLineOptParser.cc
@@ -157,6 +154,7 @@ add_subdirectory(FactSystem)
 add_subdirectory(FirmwarePlugin)
 add_subdirectory(FlightDisplay)
 add_subdirectory(FlightMap)
+add_subdirectory(FollowMe)
 add_subdirectory(GPS)
 add_subdirectory(Joystick)
 add_subdirectory(MissionManager)
@@ -200,6 +198,7 @@ target_link_libraries(qgc
 	FirmwarePlugin
 	FlightDisplay
 	FlightMap
+	FollowMe
 	gps
 	Joystick
 	MissionManager
diff --git a/src/FollowMe/CMakeLists.txt b/src/FollowMe/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b71c7492ffc372c045403053d17e565ad11ba87b
--- /dev/null
+++ b/src/FollowMe/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_library(FollowMe
+	FollowMe.cc
+)
+
+target_link_libraries(FollowMe
+	PUBLIC
+		qgc
+)
+
+target_include_directories(FollowMe
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+	)
+