diff --git a/tools/atspi-rssi/Makefile b/tools/atspi-rssi/Makefile
new file mode 100644
index 0000000..57edca6
--- /dev/null
+++ b/tools/atspi-rssi/Makefile
@@ -0,0 +1,21 @@
+#
+# atspi-rssi/Makefile - Build the spectrum scan utility
+#
+# Written 2010 by Werner Almesberger
+# Copyright 2010 Werner Almesberger
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+
+
+F32XBASE = ../../../f32xbase
+
+MAIN = atspi-rssi
+
+include $(F32XBASE)/lib/Makefile.common
+
+CFLAGS += -I../../fw/include -I../include
+LDLIBS += -L../lib -latspi
diff --git a/tools/atspi-rssi/atspi-rssi.c b/tools/atspi-rssi/atspi-rssi.c
new file mode 100644
index 0000000..610fb10
--- /dev/null
+++ b/tools/atspi-rssi/atspi-rssi.c
@@ -0,0 +1,92 @@
+/*
+ * atspi-rssi/atspi-rssi.c - ben-wpan AF86RF230 spectrum scan
+ *
+ * Written 2010 by Werner Almesberger
+ * Copyright 2010 Werner Almesberger
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <usb.h>
+#include <sys/time.h>
+
+#include "at86rf230.h"
+#include "atspi/ep0.h"
+#include "atspi.h"
+
+
+#define	FROM_DEV	ATSPI_FROM_DEV(0)
+#define	TO_DEV		ATSPI_TO_DEV(0)
+
+
+static struct timeval t0;
+
+
+static void sweep(usb_dev_handle *dev)
+{
+	int chan, rssi;
+	struct timeval t;
+
+	for (chan = 11; chan <= 26; chan++) {
+		atspi_reg_write(dev, REG_PHY_CC_CCA, chan);
+		/*
+		 * No need to explicitly wait for the PPL lock - going USB-SPI
+		 * is pretty slow, leaving the transceiver plenty of time.
+		 */
+		gettimeofday(&t, NULL);
+		rssi = atspi_reg_read(dev, REG_PHY_RSSI) & RSSI_MASK;
+		t.tv_sec -= t0.tv_sec;
+		t.tv_usec -= t0.tv_usec;
+		printf("%d %f %d\n",
+		    2405+(chan-11)*5,
+		    (double) t.tv_sec+t.tv_usec/1000000.0,
+		    -91+3*(rssi-1));
+	}
+	printf("\n");
+}
+
+
+static void usage(const char *name)
+{
+	fprintf(stderr, "%s sweeps \n", name);
+	exit(1);
+}
+
+
+int main(int argc, const char **argv)
+{
+	usb_dev_handle *dev;
+	unsigned long sweeps, i;
+	char *end;
+
+	if (argc != 2)
+		usage(*argv);
+	sweeps = strtoul(argv[1], &end, 0);
+	if (*end)
+		usage(*argv);
+
+	dev = atspi_open();
+	if (!dev)
+		return 1;
+
+	atspi_reg_write(dev, REG_TRX_STATE, TRX_CMD_TRX_OFF);
+	/*
+	 * No need to explicitly wait for things to stabilize - going USB-SPI
+	 * is pretty slow, leaving the transceiver more than enough time.
+	 */
+	atspi_reg_write(dev, REG_TRX_STATE, TRX_CMD_RX_ON);
+
+	gettimeofday(&t0, NULL);
+	for (i = 0; i != sweeps; i++)
+		sweep(dev);
+
+	atspi_reg_write(dev, REG_TRX_STATE, TRX_CMD_TRX_OFF);
+
+	return 0;
+}