diff --git a/contrib/plugins/helloworld.py b/contrib/plugins/helloworld.py
index 19e07fc22..3cc2462a2 100755
--- a/contrib/plugins/helloworld.py
+++ b/contrib/plugins/helloworld.py
@@ -35,7 +35,7 @@ def on_disconnect(plugin, id):
 
 
 @plugin.hook("htlc_accepted")
-def on_htlc_accepted(plugin):
+def on_htlc_accepted(onion, htlc, plugin):
     plugin.log('on_htlc_accepted called')
     time.sleep(20)
     return None
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index 92e80169a..ac497b122 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -621,6 +621,7 @@ struct htlc_accepted_hook_payload {
 	struct htlc_in *hin;
 	struct channel *channel;
 	struct lightningd *ld;
+	u8 *next_onion;
 };
 
 /**
@@ -642,6 +643,28 @@ htlc_accepted_hook_deserialize(const tal_t *ctx, const char *buffer,
 static void htlc_accepted_hook_serialize(struct htlc_accepted_hook_payload *p,
 					 struct json_stream *s)
 {
+	const struct route_step *rs = p->route_step;
+	const struct htlc_in *hin = p->hin;
+	json_object_start(s, "onion");
+
+	if (rs->hop_data.realm == 0x00) {
+		json_object_start(s, "per_hop_v0");
+		json_add_hex(s, "realm", &rs->hop_data.realm, 1);
+		json_add_short_channel_id(s, "short_channel_id", &rs->hop_data.channel_id);
+		json_add_amount_msat_only(s, "forward_amount", rs->hop_data.amt_forward);
+		json_add_u64(s, "outgoing_cltv_value", rs->hop_data.outgoing_cltv);
+		json_object_end(s);
+	}
+
+	json_add_hex_talarr(s, "next_onion", p->next_onion);
+	json_add_hex(s, "shared_secret", &hin->shared_secret, sizeof(hin->shared_secret));
+	json_object_end(s);
+
+	json_object_start(s, "htlc");
+	json_add_amount_msat_only(s, "amount", hin->msat);
+	json_add_u64(s, "cltv_expiry", hin->cltv_expiry);
+	json_add_hex(s, "payment_hash", hin->payment_hash.u.u8, sizeof(hin->payment_hash));
+	json_object_end(s);
 }
 
 /**
@@ -663,7 +686,7 @@ htlc_accepted_hook_callback(struct htlc_accepted_hook_payload *request,
 	if (rs->nextcase == ONION_FORWARD) {
 		struct gossip_resolve *gr = tal(ld, struct gossip_resolve);
 
-		gr->next_onion = serialize_onionpacket(gr, rs->next);
+		gr->next_onion = tal_steal(gr, request->next_onion);
 		gr->next_channel = rs->hop_data.channel_id;
 		gr->amt_to_forward = rs->hop_data.amt_forward;
 		gr->outgoing_cltv_value = rs->hop_data.outgoing_cltv;
@@ -784,6 +807,8 @@ static bool peer_accepted_htlc(struct channel *channel,
 	hook_payload->ld = ld;
 	hook_payload->hin = hin;
 	hook_payload->channel = channel;
+	hook_payload->next_onion = serialize_onionpacket(hook_payload, rs->next);
+
 	plugin_hook_call_htlc_accepted(ld, hook_payload, hook_payload);
 
 	/* Falling through here is ok, after all the HTLC locked */
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
index 07f42585d..29dc4dd4e 100644
--- a/wallet/test/run-wallet.c
+++ b/wallet/test/run-wallet.c
@@ -212,6 +212,12 @@ void json_add_amount_msat_compat(struct json_stream *result UNNEEDED,
 				 const char *msatfieldname)
 
 { fprintf(stderr, "json_add_amount_msat_compat called!\n"); abort(); }
+/* Generated stub for json_add_amount_msat_only */
+void json_add_amount_msat_only(struct json_stream *result UNNEEDED,
+			  const char *msatfieldname UNNEEDED,
+			  struct amount_msat msat)
+
+{ fprintf(stderr, "json_add_amount_msat_only called!\n"); abort(); }
 /* Generated stub for json_add_amount_sat_compat */
 void json_add_amount_sat_compat(struct json_stream *result UNNEEDED,
 				struct amount_sat sat UNNEEDED,