diff --git a/src/libutil/compression.hh b/src/libutil/compression.hh
index dd666a4e1..1bd118b47 100644
--- a/src/libutil/compression.hh
+++ b/src/libutil/compression.hh
@@ -25,4 +25,16 @@ MakeError(UnknownCompressionMethod, Error);
 
 MakeError(CompressionError, Error);
 
+template<>
+struct TeeSink<ref<CompressionSink>> : CompressionSink
+{
+    MAKE_TEE_SINK(ref<CompressionSink>);
+    void finish() override {
+        orig->finish();
+    }
+    void write(const unsigned char * data, size_t len) override {
+        return orig->write(data, len);
+    }
+};
+
 }
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index a04118512..88a6b7ffe 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -181,6 +181,28 @@ struct TeeSource : Source
     }
 };
 
+#define MAKE_TEE_SINK(T) \
+	T orig; \
+    ref<std::string> data; \
+    TeeSink(T && orig) \
+        : orig(std::move(orig)), data(make_ref<std::string>()) { } \
+    void operator () (const unsigned char * data, size_t len) { \
+        this->data->append((const char *) data, len); \
+        (*this->orig)(data, len); \
+    } \
+    void operator () (const std::string & s) \
+    { \
+        *data += s; \
+        (*this->orig)(s); \
+    }
+
+template<typename T>
+struct TeeSink : Sink
+{
+    MAKE_TEE_SINK(T);
+};
+
+
 /* A reader that consumes the original Source until 'size'. */
 struct SizedSource : Source
 {