diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6c54c12ee..f0b17252fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,6 +381,8 @@ endif()
 if(INDI_BUILD_DRIVERS OR INDI_BUILD_CLIENT OR INDI_BUILD_QT5_CLIENT)
     install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/json.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/libs/httplib.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/libs/inicpp.h
         ${CMAKE_CURRENT_BINARY_DIR}/indiversion.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/libindi COMPONENT Devel
     )
diff --git a/drivers.xml b/drivers.xml
index d5d0d7c9b2..bbeef1c254 100644
--- a/drivers.xml
+++ b/drivers.xml
@@ -303,6 +303,10 @@
             <driver name="PMC8">indi_pmc8_telescope</driver>
             <version>0.5</version>
         </device>
+        <device label="Planewave" manufacturer="Planewave Instruments">
+            <driver name="Planewave">indi_planewave_telescope</driver>
+            <version>0.1</version>
+        </device>
     </devGroup>
     <devGroup group="Focusers">
         <device label="Focuser Simulator" manufacturer="Simulator">
diff --git a/drivers/telescope/CMakeLists.txt b/drivers/telescope/CMakeLists.txt
index 017677beb5..331a30d84e 100644
--- a/drivers/telescope/CMakeLists.txt
+++ b/drivers/telescope/CMakeLists.txt
@@ -257,3 +257,11 @@ add_executable(indi_skywatcherAltAzMount
 target_link_libraries(indi_skywatcherAltAzMount AlignmentDriver indidriver)
 
 install(TARGETS indi_skywatcherAltAzMount RUNTIME DESTINATION bin)
+
+# ########## Planewave Mount ##############
+add_executable(indi_planewave_telescope
+    planewave_mount.cpp)
+
+target_link_libraries(indi_planewave_telescope indidriver)
+
+install(TARGETS indi_planewave_telescope RUNTIME DESTINATION bin)