diff --git a/templates/hp_procurve_show_mac-address.template b/templates/hp_procurve_show_mac-address.template
new file mode 100644
index 0000000000..d9b8f2e0d8
--- /dev/null
+++ b/templates/hp_procurve_show_mac-address.template
@@ -0,0 +1,11 @@
+Value MAC ([0-9a-fA-F]{6}-[0-9a-fA-F]{6})
+Value PORT (\S+)
+Value VLAN (\d+)
+
+Start
+  ^\s*--- -> Start_record
+
+Start_record
+  ^\s+${MAC}\s+${PORT}\s+${VLAN} -> Record
+  ^\s*$$
+  ^. -> Error
diff --git a/templates/index b/templates/index
index c9f14fc1af..96964141f2 100644
--- a/templates/index
+++ b/templates/index
@@ -91,7 +91,7 @@ brocade_netiron_show_span.template, .*, brocade_netiron, sh[[ow]] sp[[anning-tre
 brocade_netiron_show_topo.template, .*, brocade_netiron, sh[[ow]] to[[pology-group]]
 
 checkpoint_gaia_show_interfaces_all.template, .*, checkpoint_gaia, show interfaces all
-checkpoint_gaia_show_ntp_servers.template, .*, checkpoint_gaia, show ntp servers 
+checkpoint_gaia_show_ntp_servers.template, .*, checkpoint_gaia, show ntp servers
 checkpoint_gaia_show_version_all.template, .*, checkpoint_gaia, show version all
 checkpoint_gaia_show_domainname.template, .*, checkpoint_gaia, show domainname
 checkpoint_gaia_show_ipv6_route.template, .*, checkpoint_gaia, show ipv6 route
@@ -270,6 +270,7 @@ hp_comware_display_clock.template, .*, hp_comware, di[[splay]] clo[[ck]]
 hp_comware_display_arp.template, .*, hp_comware, di[[splay]] a[[rp]]
 
 hp_procurve_show_tech_buffers.template, .*, hp_procurve, sh[[ow]] tec[[h]] buf[[ffers]]
+hp_procurve_show_mac-address.template, .*, hp_procurve, sh[[ow]] mac-a[[ddress]]
 hp_procurve_show_system.template, .*, hp_procurve, sh[[ow]] syst[[em]]
 hp_procurve_show_vlans.template, .*, hp_procurve, sh[[ow]] vl[[ans]]
 hp_procurve_show_arp.template, .*, hp_procurve, sh[[ow]] ar[[p]]
diff --git a/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.parsed b/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.parsed
new file mode 100644
index 0000000000..863ce43bc7
--- /dev/null
+++ b/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.parsed
@@ -0,0 +1,15 @@
+---
+parsed_sample:
+
+-   mac: '500000-260000'
+    port: Trk1
+    vlan: '17'
+-   mac: '500000-a80009'
+    port: Trk1
+    vlan: '10'
+-   mac: '500000-260000'
+    port: Trk1
+    vlan: '50'
+-   mac: '500000-b70008'
+    port: '25'
+    vlan: '50'
diff --git a/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.raw b/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.raw
new file mode 100644
index 0000000000..e11e1c22fd
--- /dev/null
+++ b/tests/hp_procurve/show_mac-address/hp_procurve_show_mac-address.raw
@@ -0,0 +1,9 @@
+
+ Status and Counters - Port Address Table
+
+  MAC Address       Port                            VLAN
+  ----------------- ------------------------------- ----
+  500000-260000     Trk1                            17
+  500000-a80009     Trk1                            10
+  500000-260000     Trk1                            50
+  500000-b70008     25                              50