3 files changed, 9 insertions, 2 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index a9750e4de6ef..4c132242d3ce 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -1710,6 +1710,7 @@ aac*)
 	unit=`expr $i : 'aac\(.*\)'`
 	mknod aac$unit c 150 `unit2minor $unit`
 	ln -fs aac$unit afa$unit
+	ln -fs aac$unit hpn$unit
 	;;
 
 mlx*)
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 07d35df275e5..3988c4d751e7 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -73,8 +73,13 @@ or a Linux-based management application.
 .Pp
 The
 .Pa /dev/aac?
-device nodes provides access to the management interface of the controller.
-One node exists per installed card.
+device nodes provide access to the management interface of the controller.
+One node exists per installed card.  The aliases
+.Pa /dev/afa?
+and
+.Pa /dev/hpn?
+exist for the Dell and HP flavors, respectively, and are required for
+the CLI management utility available from these vendors to work.
 Compiling the driver with the
 .Dv AAC_COMPAT_LINUX
 option enables the Linux-compatible
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index ccffb18ed4bb..1808e0d2828a 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -236,6 +236,7 @@ aac_attach(struct aac_softc *sc)
     unit = device_get_unit(sc->aac_dev);
     sc->aac_dev_t = make_dev(&aac_cdevsw, unit, UID_ROOT, GID_WHEEL, 0644, "aac%d", unit);
     (void)make_dev_alias(sc->aac_dev_t, "afa%d", unit);
+    (void)make_dev_alias(sc->aac_dev_t, "hpn%d", unit);
 
     sc->aac_dev_t->si_drv1 = sc;