diff --git a/conf/modules/bebop_front_camera.xml b/conf/modules/bebop_front_camera.xml
index fb2f3f2eb4..a381a4ea81 100644
--- a/conf/modules/bebop_front_camera.xml
+++ b/conf/modules/bebop_front_camera.xml
@@ -7,6 +7,9 @@
 
     </description>
     <define name="BEBOP_FRONT_CAMERA_SHOT_PATH" value="/data/ftp/internal_000/images" description="Path where the images should be saved"/>
+    <configure name="BEBOP_FRONT_CAMERA_HOST" value="192.168.1.255" description="GCS IP (default: MODEM_HOST)"/>
+    <configure name="BEBOP_FRONT_CAMERA_PORT_OUT" value="6000" description="Port (default: 5000)"/>
+    <configure name="BEBOP_FRONT_CAMERA_BROADCAST" value="FALSE|TRUE" description="Enable broadcast of image stream (default: TRUE)"/>
   </doc>
   <settings>
     <dl_settings>
@@ -41,9 +44,11 @@
     <flag name="LDFLAGS" value="static-libgcc"/>
 
     <raw>
+      include $(CFG_SHARED)/udp.makefile
+
       BEBOP_FRONT_CAMERA_HOST        ?= $(MODEM_HOST)
       BEBOP_FRONT_CAMERA_PORT_OUT    ?= 6000
-      BEBOP_FRONT_CAMERA_BROADCAST   ?= $(MODEM_BROADCAST)
+      BEBOP_FRONT_CAMERA_BROADCAST   ?= TRUE
 
       BEBOPVIEWVID_CFLAGS  = -DBEBOP_FRONT_CAMERA_HOST=$(BEBOP_FRONT_CAMERA_HOST) -DBEBOP_FRONT_CAMERA_PORT_OUT=$(BEBOP_FRONT_CAMERA_PORT_OUT)
       ifeq ($(BEBOP_FRONT_CAMERA_USE_NETCAT),)
diff --git a/conf/modules/video_rtp_stream.xml b/conf/modules/video_rtp_stream.xml
index 6bf61e0693..a20b47b91d 100644
--- a/conf/modules/video_rtp_stream.xml
+++ b/conf/modules/video_rtp_stream.xml
@@ -3,7 +3,7 @@
 <module name="video_rtp_stream" dir="computer_vision">
   <doc>
     <description>
-      Video streaming for Linux based devices. 
+      Video streaming for Linux based devices.
       Works e.g. in conjunction with Parrot Drones where the autopilot is the Paparazzi autopilot.
       Features:
        - Sends a RTP/UDP stream of the camera image, a.k.a. live video
@@ -12,6 +12,8 @@
     </description>
     <configure name="VIEWVIDEO_USE_NETCAT" value="FALSE|TRUE" description="Use netcat for transfering images instead of RTP stream (default: FALSE)"/>
     <configure name="VIEWVIDEO_HOST" value="192.168.1.255" description="GCS IP (default: MODEM_HOST)"/>
+    <configure name="VIEWVIDEO_PORT_OUT" value="5000" description="Port (default: 5000)"/>
+    <configure name="VIEWVIDEO_BROADCAST" value="FALSE|TRUE" description="Enable broadcast of image stream (default: TRUE)"/>
     <define name="VIEWVIDEO_DOWNSIZE_FACTOR" value="4" description="Reduction factor of the video stream"/>
     <define name="VIEWVIDEO_QUALITY_FACTOR" value="50" description="JPEG encoding compression factor [0-99]"/>
     <define name="VIEWVIDEO_USE_RTP" value="TRUE|FALSE" description="Enable RTP at startup for transfering images (default: TRUE)"/>
@@ -39,9 +41,11 @@
 
     <!-- Define the network connection to send images over -->
     <raw>
+      include $(CFG_SHARED)/udp.makefile
+
       VIEWVIDEO_HOST        ?= $(MODEM_HOST)
       VIEWVIDEO_PORT_OUT    ?= 5000
-      VIEWVIDEO_BROADCAST   ?= $(MODEM_BROADCAST)
+      VIEWVIDEO_BROADCAST   ?= TRUE
       VIEWVIDEO_USE_NETCAT  ?= FALSE
 
       VIEWVID_CFLAGS  = -DVIEWVIDEO_HOST=$(VIEWVIDEO_HOST) -DVIEWVIDEO_PORT_OUT=$(VIEWVIDEO_PORT_OUT)