diff --git a/README-CMAKE.md b/README-CMAKE.md
index 3dde6d0511..bb6c5e5c8d 100644
--- a/README-CMAKE.md
+++ b/README-CMAKE.md
@@ -6,6 +6,7 @@ WPILib is normally built with Gradle, however for some systems, such as Linux ba
 * apriltag
 * cameraserver
 * cscore
+* fieldImages
 * hal (simulation HAL only)
 * ntcore
 * romiVendordep
diff --git a/fieldImages/CMakeLists.txt b/fieldImages/CMakeLists.txt
index 315615b106..93f8e13695 100644
--- a/fieldImages/CMakeLists.txt
+++ b/fieldImages/CMakeLists.txt
@@ -27,6 +27,11 @@ if(WITH_JAVA)
     )
     set_property(TARGET field_images_jar PROPERTY FOLDER "java")
     install_jar(field_images_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(
+        TARGETS field_images_jar
+        FILE fieldImages_jar.cmake
+        DESTINATION share/fieldImages
+    )
 endif()
 
 generate_resources(
@@ -47,12 +52,17 @@ if(MSVC)
 endif()
 wpilib_target_warnings(fieldImages)
 
+install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/fieldImages")
 target_include_directories(
     fieldImages
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
-        $<INSTALL_INTERFACE:${include_dest}/fields>
+        $<INSTALL_INTERFACE:${include_dest}/fieldImages>
 )
 
 install(TARGETS fieldImages EXPORT fieldimages)
 export(TARGETS fieldImages FILE fieldimages.cmake NAMESPACE fieldimages::)
+
+configure_file(fieldimages-config.cmake.in ${WPILIB_BINARY_DIR}/fieldimages-config.cmake)
+install(FILES ${WPILIB_BINARY_DIR}/fieldimages-config.cmake DESTINATION share/fieldImages)
+install(EXPORT fieldimages DESTINATION share/fieldImages)
diff --git a/fieldImages/fieldimages-config.cmake.in b/fieldImages/fieldimages-config.cmake.in
new file mode 100644
index 0000000000..35f453be47
--- /dev/null
+++ b/fieldImages/fieldimages-config.cmake.in
@@ -0,0 +1,5 @@
+@FILENAME_DEP_REPLACE@
+include(${SELF_DIR}/fieldimages.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/fieldImages_jar.cmake)
+endif()