diff --git a/apps/fwd/BUILD b/apps/fwd/BUILD
index f2f4bc4501..40d5216a63 100644
--- a/apps/fwd/BUILD
+++ b/apps/fwd/BUILD
@@ -4,6 +4,7 @@ COMPILE_DEPS = CORE_DEPS + KRYO + CLI + [
 ]
 
 osgi_jar_with_tests(
+    karaf_command_packages = ["org.onosproject.fwd"],
     deps = COMPILE_DEPS,
 )
 
diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwardingCommand.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwardingCommand.java
index d0468d20d8..0355b641e5 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwardingCommand.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwardingCommand.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.fwd;
 import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.apache.karaf.shell.api.action.Argument;
@@ -29,6 +30,7 @@ import org.onlab.packet.MacAddress;
 public class ReactiveForwardingCommand extends AbstractShellCommand {
     @Argument(index = 0, name = "mac", description = "One Mac Address",
             required = false, multiValued = false)
+    @Completion(MacAddressCompleter.class)
     String mac = null;
     @Override
     protected void doExecute() {