diff --git a/src/spicy/CMakeLists.txt b/src/spicy/CMakeLists.txt
index 8d3d625dd7..e997004cd2 100644
--- a/src/spicy/CMakeLists.txt
+++ b/src/spicy/CMakeLists.txt
@@ -28,3 +28,5 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/scripts/spicy/" DESTINATION "${ZEEK_SPI
 set(ZEEK_SPICY_DATA_PATH "${CMAKE_INSTALL_FULL_DATADIR}/zeek" CACHE PATH "")
 
 add_subdirectory(spicyz)
+
+add_subdirectory(spicy-ldap)
diff --git a/src/spicy/spicy-ldap/CMakeLists.txt b/src/spicy/spicy-ldap/CMakeLists.txt
index ee8767848a..d17735d5b4 100644
--- a/src/spicy/spicy-ldap/CMakeLists.txt
+++ b/src/spicy/spicy-ldap/CMakeLists.txt
@@ -1,18 +1 @@
-cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
-
-project(Messages LANGUAGES C)
-
-list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-find_package(SpicyPlugin REQUIRED)
-
-# Set mininum versions that this plugin needs. Make sure to use "x.y.z" format.
-spicy_require_version("1.2.0")
-spicy_plugin_require_version("0.99.0")
-zeek_require_version("3.0.0")
-
-if (NOT CMAKE_BUILD_TYPE)
-    # Default to release build.
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
-endif ()
-
 add_subdirectory(analyzer)
diff --git a/src/spicy/spicy-ldap/analyzer/CMakeLists.txt b/src/spicy/spicy-ldap/analyzer/CMakeLists.txt
index 094fe4aecb..1bd759cf7c 100644
--- a/src/spicy/spicy-ldap/analyzer/CMakeLists.txt
+++ b/src/spicy/spicy-ldap/analyzer/CMakeLists.txt
@@ -1,5 +1,4 @@
 spicy_add_analyzer(
     NAME LDAP
     PACKAGE_NAME spicy-ldap
-    SOURCES ldap.spicy ldap.evt ldap_zeek.spicy
-    SCRIPTS __load__.zeek main.zeek dpd.sig)
+    SOURCES ldap.spicy ldap.evt ldap_zeek.spicy)
diff --git a/src/spicy/spicy-ldap/cmake/FindSpicyPlugin.cmake b/src/spicy/spicy-ldap/cmake/FindSpicyPlugin.cmake
deleted file mode 100644
index 67cbd4716e..0000000000
--- a/src/spicy/spicy-ldap/cmake/FindSpicyPlugin.cmake
+++ /dev/null
@@ -1,78 +0,0 @@
-# Find the Spicy plugin to get access to the infrastructure it provides.
-#
-# While most of the actual CMake logic for building analyzers comes with the Spicy
-# plugin for Zeek, this code bootstraps us by asking "spicyz" for the plugin's
-# location. Either make sure that "spicyz" is in PATH, set the environment
-# variable SPICYZ to point to its location, or set variable ZEEK_SPICY_ROOT
-# in either CMake or environment to point to its installation or build
-# directory.
-#
-# This exports:
-#
-#     SPICY_PLUGIN_FOUND            True if plugin and all dependencies were found
-#     SPICYZ                        Path to spicyz
-#     SPICY_PLUGIN_VERSION          Version string of plugin
-#     SPICY_PLUGIN_VERSION_NUMBER   Numerical version number of plugin
-
-# Runs `spicyz` with the flags given as second argument and stores the output in the variable named
-# by the first argument.
-function (run_spicycz output)
-    execute_process(COMMAND "${SPICYZ}" ${ARGN} OUTPUT_VARIABLE output_
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    string(STRIP "${output_}" output_)
-    set(${output} "${output_}" PARENT_SCOPE)
-endfunction ()
-
-# Checks that the Spicy plugin version it at least the given version.
-function (spicy_plugin_require_version version)
-    string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*).*" _ ${version})
-    math(EXPR version_number "${CMAKE_MATCH_1} * 10000 + ${CMAKE_MATCH_2} * 100 + ${CMAKE_MATCH_3}")
-
-    if ("${SPICY_PLUGIN_VERSION_NUMBER}" LESS "${version_number}")
-        message(FATAL_ERROR "Package requires at least Spicy plugin version ${version}, "
-                            "have ${SPICY_PLUGIN_VERSION}")
-    endif ()
-endfunction ()
-
-###
-### Main
-###
-
-if (NOT SPICYZ)
-    set(SPICYZ "$ENV{SPICYZ}")
-endif ()
-
-if (NOT SPICYZ)
-    # Support an in-tree Spicy build.
-    find_program(
-        spicyz spicyz
-        HINTS ${ZEEK_SPICY_ROOT}/bin ${ZEEK_SPICY_ROOT}/build/bin $ENV{ZEEK_SPICY_ROOT}/bin
-              $ENV{ZEEK_SPICY_ROOT}/build/bin ${PROJECT_SOURCE_DIR}/../../build/bin)
-    set(SPICYZ "${spicyz}")
-endif ()
-
-message(STATUS "spicyz: ${SPICYZ}")
-
-if (SPICYZ)
-    set(SPICYZ "${SPICYZ}" CACHE PATH "" FORCE) # make sure it's in the cache
-
-    run_spicycz(SPICY_PLUGIN_VERSION "--version")
-    run_spicycz(SPICY_PLUGIN_VERSION_NUMBER "--version-number")
-    message(STATUS "Zeek plugin version: ${SPICY_PLUGIN_VERSION}")
-
-    run_spicycz(spicy_plugin_path "--print-plugin-path")
-    set(spicy_plugin_cmake_path "${spicy_plugin_path}/cmake")
-    message(STATUS "Zeek plugin CMake path: ${spicy_plugin_cmake_path}")
-
-    list(PREPEND CMAKE_MODULE_PATH "${spicy_plugin_cmake_path}")
-    find_package(Zeek REQUIRED)
-    find_package(Spicy REQUIRED)
-    zeek_print_summary()
-    spicy_print_summary()
-
-    include(ZeekSpicyAnalyzerSupport)
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SpicyPlugin DEFAULT_MSG SPICYZ ZEEK_FOUND)