diff --git a/targets/build_helper.bash b/targets/build_helper.bash
index f2bb898f6e70f9fa7a1948e9fdf480cb14de964c..c51a99bac83f9f299de888cc87568899b7895fe9 100755
--- a/targets/build_helper.bash
+++ b/targets/build_helper.bash
@@ -1158,6 +1158,7 @@ print_help(){
     echo_success "-l | --build-target                     : Set the LTE build target: ENB,EPC,HSS,NONE (default ENB)"
     echo_success "-m | --build-from-makefile              : Enable build from the makefile (default disabled)"
     echo_success "-r | --3gpp-release                     : Set the release: REL8, REL10 (default REL8)"
+    echo_success "-p | --wireshark                        : enable wireshark interface for L2 pdus"
     echo_success "-R | --run                              : Run the executable built by this script"
     echo_success "-s | --check                            : Enable OAI testing and sanity check (default disabled)"
     echo_success "-t | --enb-build-target                 : Set the eNB build target: ALL, SOFTMODEM,OAISIM,UNISIM (default ALL)"
diff --git a/targets/build_oai.bash b/targets/build_oai.bash
index 79b5198907e80b70eb6b1474ccf113cb30cec206..65198e71b72dc9ac737564237e62e1df2544afa9 100755
--- a/targets/build_oai.bash
+++ b/targets/build_oai.bash
@@ -224,6 +224,11 @@ fi
             echo "setting xforms to: $XFORMS"
             shift;
             ;;
+       -p | --wireshark)
+	  WIRESHARK=1
+	  echo "enabling Wireshark interface to $WIRESHARK"
+          shift;
+          ;;
        -z | --defaults)
             echo "setting all parameters to: default"
             rm -rf ./.lock_oaibuild
@@ -737,6 +742,9 @@ if [ $RUN -ne 0 ]; then
                     $SUDO chmod 777 $OPENAIR_TARGETS/RT/USER/init_exmimo2.sh
                     $SUDO $OPENAIR_TARGETS/RT/USER/init_exmimo2.sh
                 fi
+		if [ $WIRESHARK -eq 1 ]; then 
+		    EXE_ARGUMENTS="$EXE_ARGUMENTS -W"
+		fi 
                 echo "############# running ltesoftmodem #############"
                 if [ $RUN_GDB -eq 0 ]; then 
                     $SUDO $OPENAIR_TARGETS/bin/lte-softmodem  `echo $EXE_ARGUMENTS`
@@ -770,7 +778,9 @@ if [ $RUN -ne 0 ]; then
                     insmod  $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/ue_ip.ko
                     
                 fi
-                
+                if [ $WIRESHARK -eq 1 ]; then 
+		    EXE_ARGUMENTS="$EXE_ARGUMENTS -P wireshark"
+		fi 
                 if [ $RUN_GDB -eq 0 ]; then 
                     $SUDO exec $OPENAIR_TARGETS/bin/oaisim  `echo $EXE_ARGUMENTS`
                 else