diff --git a/ChangeLog b/ChangeLog
index bedd7d71..4f557673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ version 1.0 ()
     + Added set_i_duplex_admin() and set_i_speed_admin() to C2900 class (Justin Hunter)
     + Added set_i_duplex_admin() and set_i_speed_admin() to CiscoStack class
     + CDP added to Aironet class
+    + Added Juniper class
 
     * More error checking in  _load_attr() around bulkwalk code
     * Minor warning fix in L3::Aironet::os_ver()
diff --git a/Info.pm b/Info.pm
index ce2ed572..d1be83bb 100644
--- a/Info.pm
+++ b/Info.pm
@@ -875,6 +875,9 @@ sub device_type {
         # Default generic cisco
         $objtype = 'SNMP::Info::Layer3::Cisco' if ($objtype eq 'SNMP::Info::Layer3' and $desc =~ /\bIOS\b/);
 
+        # Default generic Juniper
+        $objtype = 'SNMP::Info::Layer3::Juniper' if ($objtype eq 'SNMP::Info::Layer3' and $desc =~ /\bJUNOS\b/);
+
     # Layer 2 Supported
     } elsif ($info->has_layer(2)) {
         $objtype = 'SNMP::Info::Layer2'; 
diff --git a/Info/Layer3/Juniper.pm b/Info/Layer3/Juniper.pm
new file mode 100644
index 00000000..18993bfd
--- /dev/null
+++ b/Info/Layer3/Juniper.pm
@@ -0,0 +1,179 @@
+# SNMP::Info::Layer3::Juniper
+# Bill Fenner
+#
+# 
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met:
+# 
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the 
+#       names of its contributors may be used to endorse or promote products 
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::Juniper;
+# $Id$
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Juniper::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Juniper::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,  
+	    'JUNIPER-CHASSIS-DEFINES-MIB' => 'jnxChassisDefines',
+	    'JUNIPER-MIB' => 'jnxBoxAnatomy',
+	);
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+	    'serial' => 'jnxBoxSerialNo',
+	   );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+	 );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+	 );
+
+sub vendor {
+	return 'juniper';
+}
+
+sub os {
+	return 'junos';
+}
+
+sub os_ver {
+    my $juniper = shift;
+    my $descr = $juniper->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/kernel JUNOS (\S+)/) {
+	return $1;
+    }
+    return undef;
+}
+
+sub model {
+    my $l3 = shift;
+    my $id = $l3->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::Juniper::model() - Device does not support sysObjectID\n" if $l3->debug(); 
+        return undef;
+    }
+    
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^jnxProductName//i;
+    return $model;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Juniper - Perl5 Interface to L3 Juniper Devices
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $juniper = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $juniper->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Juniper Routers running JUNOS
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $juniper->vendor()
+
+    Returns 'juniper'
+
+=item $juniper->os()
+
+    Returns 'junos'
+
+=item $juniper->os_ver()
+
+    Returns the software version extracted from sysDescr.
+
+=item $juniper->model()
+
+    Returns the model from sysObjectID, with jnxProductName
+    removed from the beginning.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head1 TABLE ENTRIES
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=cut