diff --git a/src/config/config.c b/src/config/config.c
index 6596e951..13fa7db4 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -269,6 +269,9 @@ REQUIRE_OBJECT ( pci_cmd );
 #ifdef PARAM_CMD
 REQUIRE_OBJECT ( param_cmd );
 #endif
+#ifdef NEIGHBOUR_CMD
+REQUIRE_OBJECT ( neighbour_cmd );
+#endif
 
 /*
  * Drag in miscellaneous objects
diff --git a/src/config/general.h b/src/config/general.h
index 2e93efde..00a327f2 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -132,6 +132,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#define IMAGE_TRUST_CMD	/* Image trust management commands */
 //#define PCI_CMD		/* PCI commands */
 //#define PARAM_CMD		/* Form parameter commands */
+//#define NEIGHBOUR_CMD		/* Neighbour management commands */
 
 /*
  * ROM-specific options
diff --git a/src/hci/commands/neighbour_cmd.c b/src/hci/commands/neighbour_cmd.c
new file mode 100644
index 00000000..d65c355c
--- /dev/null
+++ b/src/hci/commands/neighbour_cmd.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * 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 any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+/** @file
+ *
+ * Neighbour management commands
+ *
+ */
+
+#include <getopt.h>
+#include <ipxe/parseopt.h>
+#include <ipxe/command.h>
+#include <usr/neighmgmt.h>
+
+/** "nstat" options */
+struct nstat_options {};
+
+/** "nstat" option list */
+static struct option_descriptor nstat_opts[] = {};
+
+/** "nstat" command descriptor */
+static struct command_descriptor nstat_cmd =
+	COMMAND_DESC ( struct nstat_options, nstat_opts, 0, 0, "" );
+
+/**
+ * The "nstat" command
+ *
+ * @v argc		Argument count
+ * @v argv		Argument list
+ * @ret rc		Return status code
+ */
+static int nstat_exec ( int argc, char **argv ) {
+	struct nstat_options opts;
+	int rc;
+
+	/* Parse options */
+	if ( ( rc = parse_options ( argc, argv, &nstat_cmd, &opts ) ) != 0)
+		return rc;
+
+	nstat();
+
+	return 0;
+}
+
+/** Neighbour management commands */
+struct command neighbour_commands[] __command = {
+	{
+		.name = "nstat",
+		.exec = nstat_exec,
+	},
+};