diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
index 1fa493e1a..84844b4dd 100644
--- a/tests/fuzz/Makefile
+++ b/tests/fuzz/Makefile
@@ -18,9 +18,11 @@ FUZZ_COMMON_OBJS := \
 	common/base32.o					\
 	common/base64.o					\
 	common/bech32.o					\
+	common/bech32_util.o				\
 	common/bip32.o					\
 	common/bigsize.o				\
 	common/blockheight_states.o			\
+	common/bolt11.o					\
 	common/channel_config.o				\
 	common/close_tx.o				\
 	common/configdir.o				\
@@ -34,6 +36,7 @@ FUZZ_COMMON_OBJS := \
 	common/descriptor_checksum.o			\
 	common/features.o				\
 	common/fee_states.o				\
+	common/hash_u5.o				\
 	common/hsm_encryption.o				\
 	common/htlc_state.o				\
 	common/permute_tx.o				\
diff --git a/tests/fuzz/fuzz-bolt11.c b/tests/fuzz/fuzz-bolt11.c
new file mode 100644
index 000000000..d83040357
--- /dev/null
+++ b/tests/fuzz/fuzz-bolt11.c
@@ -0,0 +1,133 @@
+#include "config.h"
+
+#include <bitcoin/chainparams.h>
+#include <common/bech32.h>
+#include <common/bolt11.h>
+#include <common/features.h>
+#include <common/setup.h>
+#include <common/utils.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <tests/fuzz/libfuzz.h>
+
+// Default mutator defined by libFuzzer.
+size_t LLVMFuzzerMutate(uint8_t *data, size_t size, size_t max_size);
+size_t LLVMFuzzerCustomMutator(uint8_t *fuzz_data, size_t size, size_t max_size,
+			       unsigned int seed);
+
+void init(int *argc, char ***argv)
+{
+	chainparams = chainparams_for_network("bitcoin");
+	common_setup("fuzzer");
+}
+
+// Encodes a dummy bolt11 invoice into `fuzz_data` and returns the size of the
+// encoded string.
+static size_t initial_input(uint8_t *fuzz_data, size_t size, size_t max_size)
+{
+	// Dummy invoice was created by encoding a default initialized `struct
+	// bolt11`.
+	const char dummy[] =
+	    "lnbc16lta047pp5h6lta047h6lta047h6lta047h6lta047h6lta047h6lta047"
+	    "h6lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq"
+	    "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxnht6w";
+
+	const size_t dummy_len = sizeof(dummy) - 1;
+	size = max_size < dummy_len ? max_size : dummy_len;
+	memcpy(fuzz_data, dummy, size);
+
+	clean_tmpctx();
+	return size;
+}
+
+// We use a custom mutator to produce an input corpus that consists entirely of
+// correctly encoded bech32 strings. This enables us to efficiently fuzz the
+// bolt11 decoding logic without the fuzzer getting stuck on fuzzing the bech32
+// decoding/encoding logic.
+//
+// This custom mutator does the following things:
+//   1. Attempt to bech32 decode the given input (returns the encoded dummy
+//      invoice on failure).
+//   2. Mutate either the human readable or data part of the invoice using
+//      libFuzzer's default mutator `LLVMFuzzerMutate`.
+//   3. Attempt to bech32 encode the mutated hrp and data (returns the endcoded
+//      dummy on failure).
+//   4. Write the encoded result to `fuzz_data` if its size does not exceed
+//      `max_size`, otherwise return the encoded dummy invoice.
+size_t LLVMFuzzerCustomMutator(uint8_t *fuzz_data, size_t size, size_t max_size,
+			       unsigned int seed)
+{
+	if (size < 8)
+		return initial_input(fuzz_data, size, max_size);
+
+	// Interpret fuzz input as string (ensure it's null terminated).
+	char *input = to_string(tmpctx, fuzz_data, size);
+
+	// Attempt to bech32 decode the input.
+	size_t hrp_maxlen = strlen(input) - 6;
+	char *hrp = tal_arr(tmpctx, char, hrp_maxlen);
+	size_t data_maxlen = strlen(input) - 8;
+	u5 *data = tal_arr(tmpctx, u5, data_maxlen);
+	size_t datalen = 0;
+	if (bech32_decode(hrp, data, &datalen, input, (size_t)-1) !=
+	    BECH32_ENCODING_BECH32) {
+		// Decoding failed, this should only happen when starting from
+		// an empty corpus.
+		return initial_input(fuzz_data, size, max_size);
+	}
+
+	// Mutate either the hrp or data. Given the same seed, the same
+	// mutation is performed.
+	srand(seed);
+	switch (rand() % 2) {
+	case 0: { // Mutate hrp and ensure it's still null terminated.
+		size_t new_len = LLVMFuzzerMutate((uint8_t *)hrp, strlen(hrp),
+						  hrp_maxlen - 1);
+		hrp[new_len] = '\0';
+		break;
+	}
+	case 1: // Mutate data and re-assign datalen.
+		datalen =
+		    LLVMFuzzerMutate((uint8_t *)data, datalen, data_maxlen);
+		break;
+	}
+
+	// Encode the mutated input.
+	char *output = tal_arr(tmpctx, char, strlen(hrp) + datalen + 8);
+	if (!bech32_encode(output, hrp, data, datalen, (size_t)-1,
+			   BECH32_ENCODING_BECH32)) {
+		return initial_input(fuzz_data, size, max_size);
+	}
+
+	// Strip (repeated) "lightning:" prefixes
+	while (strstarts(output, "lightning:") ||
+	       strstarts(output, "LIGHTNING:")) {
+		output = (char *)to_canonical_invstr(tmpctx, output);
+	}
+
+	// Write the result into `fuzz_data`.
+	size_t output_len = strlen(output);
+	if (output_len > max_size)
+		return initial_input(fuzz_data, size, max_size);
+
+	memcpy(fuzz_data, output, output_len);
+	clean_tmpctx();
+	return output_len;
+}
+
+void run(const uint8_t *data, size_t size)
+{
+	char *invoice_str = to_string(tmpctx, data, size);
+
+	struct sha256 hash;
+	const u5 *sigdata;
+	bool have_n = false;
+	char *fail;
+	bolt11_decode_nosig(tmpctx, invoice_str, NULL, NULL, chainparams, &hash,
+			    &sigdata, &have_n, &fail);
+
+	clean_tmpctx();
+}