diff --git a/Changes b/Changes
index 2de59af6..fdc404b9 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Version 3.xx (2021-xx-xx)
   [BUG FIXES]
 
   * #403 don't use layer3::dell for layer3::aruba devices
+  * layer2::aerohive supports version numbers above 9
 
 Version 3.71 (2020-11-27)
 
diff --git a/lib/SNMP/Info.pm b/lib/SNMP/Info.pm
index d6a6e396..3bb30c5c 100644
--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
@@ -528,7 +528,7 @@ See documentation in L<SNMP::Info::Layer2::Airespace> for details.
 
 =item SNMP::Info::Layer2::Aerohive
 
-Subclass for Aerohive Access Points.
+Subclass for Aerohive / Extreme access points.
 
 See documentation in L<SNMP::Info::Layer2::Aerohive> for details.
 
diff --git a/lib/SNMP/Info/Layer2/Aerohive.pm b/lib/SNMP/Info/Layer2/Aerohive.pm
index 9c7dad82..9d0b2c22 100644
--- a/lib/SNMP/Info/Layer2/Aerohive.pm
+++ b/lib/SNMP/Info/Layer2/Aerohive.pm
@@ -108,7 +108,7 @@ sub os_ver {
     my $aerohive = shift;
     my $descr    = $aerohive->description();
 
-    if ( defined ($descr) && $descr =~ m/\bHiveOS\s(\d\.\w+)\b/ix ) {
+    if ( defined ($descr) && $descr =~ m/\bHiveOS\s(\d+\.\w+)\b/ix ) {
         return $1;
     }
     return;
@@ -318,7 +318,8 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::Aerohive - SNMP Interface to Aerohive Access Points
+SNMP::Info::Layer2::Aerohive - SNMP Interface to Aerohive / Extreme
+access points
 
 =head1 AUTHOR
 
@@ -342,7 +343,7 @@ Eric Miller
 =head1 DESCRIPTION
 
 Provides abstraction to the configuration information obtainable from an
-Aerohive wireless Access Point through SNMP.
+Aerohive / Extreme wireless access point through SNMP.
 
 =head2 Inherited Classes
 
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Aerohive.pm b/xt/lib/Test/SNMP/Info/Layer2/Aerohive.pm
index 237fe806..e9028f6f 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Aerohive.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Aerohive.pm
@@ -116,12 +116,16 @@ sub os : Tests(2) {
   is($test->{info}->os(), 'hiveos', q(OS returns 'hiveos'));
 }
 
-sub os_ver : Tests(3) {
+sub os_ver : Tests(4) {
   my $test = shift;
 
   can_ok($test->{info}, 'os_ver');
   is($test->{info}->os_ver(), '6.2r1', q(OS version is expected value));
 
+  $test->{info}{_description} = 'AP250, HiveOS 10.0r8 build-236132';
+  is($test->{info}->os_ver(),
+    '10.0r8', q(10.0r8 is expected os version));
+
   $test->{info}->clear_cache();
   is($test->{info}->os_ver(), undef, q(No description returns undef os_ver));
 }