diff --git a/release-packaging/Classes/FluidBufSpectralShape.sc b/release-packaging/Classes/FluidBufSpectralShape.sc
new file mode 100644
index 0000000..2105a8e
--- /dev/null
+++ b/release-packaging/Classes/FluidBufSpectralShape.sc
@@ -0,0 +1,24 @@
+FluidBufSpectralShape{
+		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  winSize = 1024, hopSize = -1, fftSize = -1, action;
+
+		var maxFFTSize = if (fftSize == -1) {winSize.nextPowerOfTwo} {fftSize};
+
+		source = source.asUGenInput;
+		features = features.asUGenInput;
+
+		source.isNil.if {"FluidBufSpectralShape:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufSpectralShape:  Invalid features buffer".throw};
+
+		server = server ? Server.default;
+
+		//NB For wrapped versions of NRT classes, we set the params for maxima to
+		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+
+		forkIfNeeded{
+			server.sendMsg(\cmd, \BufSpectralShape, source, startFrame, numFrames, startChan, numChans, features, winSize, hopSize, fftSize, maxFFTSize);
+			server.sync;
+			features = server.cachedBufferAt(features); features.updateInfo; server.sync;
+			action.value(features);
+		};
+	}
+}
diff --git a/src/FluidBufSpectralShape/CMakeLists.txt b/src/FluidBufSpectralShape/CMakeLists.txt
new file mode 100755
index 0000000..3693881
--- /dev/null
+++ b/src/FluidBufSpectralShape/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.3)
+get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE)
+message("Configuring ${PLUGIN}")
+set(FILENAME ${PLUGIN}.cpp)
+
+add_library(
+  ${PLUGIN}
+  MODULE
+  ${FILENAME}
+)
+
+target_include_directories(
+  ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include
+)
+
+target_link_libraries(
+  ${PLUGIN} PRIVATE FLUID_DECOMPOSITION
+)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)
diff --git a/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp b/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp
new file mode 100644
index 0000000..e256c06
--- /dev/null
+++ b/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp
@@ -0,0 +1,14 @@
+
+// A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
+
+#include <clients/rt/SpectralShapeClient.hpp>
+#include <clients/nrt/FluidNRTClientWrapper.hpp>
+#include <FluidSCWrapper.hpp>
+
+static InterfaceTable *ft;
+
+PluginLoad(OfflineFluidDecompositionUGens) {
+  ft = inTable;
+  using namespace fluid::client;
+  makeSCWrapper<NRTSpectralShapeClient>("BufSpectralShape", ft);
+}