diff --git a/files/apts/neutron b/files/apts/neutron
index 648716a75e..92e0a06261 100644
--- a/files/apts/neutron
+++ b/files/apts/neutron
@@ -23,3 +23,4 @@ rabbitmq-server # NOPRIME
 qpidd # NOPRIME
 sqlite3
 vlan
+radvd # NOPRIME
diff --git a/files/rpms-suse/neutron b/files/rpms-suse/neutron
index d4841b161a..f3bafc7a6d 100644
--- a/files/rpms-suse/neutron
+++ b/files/rpms-suse/neutron
@@ -20,6 +20,7 @@ rabbitmq-server # NOPRIME
 sqlite3
 sudo
 vlan
+radvd # NOPRIME
 
 # FIXME: qpid is not part of openSUSE, those names are tentative
 python-qpid # NOPRIME
diff --git a/files/rpms/neutron b/files/rpms/neutron
index 15ed97346f..f02c02bd16 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -22,3 +22,4 @@ rabbitmq-server # NOPRIME
 qpid-cpp-server        # NOPRIME
 sqlite
 sudo
+radvd # NOPRIME
diff --git a/lib/neutron b/lib/neutron
index 98636b4b41..0c4db25da5 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -492,6 +492,10 @@ function install_neutronclient {
 
 # install_neutron_agent_packages() - Collect source and prepare
 function install_neutron_agent_packages {
+    # radvd doesn't come with the OS. Install it if the l3 service is enabled.
+    if is_service_enabled q-l3; then
+        install_package radvd
+    fi
     # install packages that are specific to plugin agent(s)
     if is_service_enabled q-agt q-dhcp q-l3; then
         neutron_plugin_install_agent_packages