diff --git a/conf/airframes/examples/bebop.xml b/conf/airframes/examples/bebop.xml
index d97ff31e16..4aa71ffe3c 100644
--- a/conf/airframes/examples/bebop.xml
+++ b/conf/airframes/examples/bebop.xml
@@ -7,6 +7,7 @@
 
     <target name="nps" board="pc">
       <subsystem name="fdm" type="jsbsim"/>
+      <subsystem name="udp"/>
     </target>
 
     <!--define name="USE_SONAR" value="TRUE"/-->
diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile
index ab42d91bae..b4e056ff26 100644
--- a/conf/boards/pc.makefile
+++ b/conf/boards/pc.makefile
@@ -12,3 +12,5 @@ BOARD_CFG = \"boards/pc_sim.h\"
 
 $(TARGET).ARCHDIR = $(ARCH)
 
+MODEM_HOST ?= 127.0.0.1
+
diff --git a/conf/modules/video_rtp_stream.xml b/conf/modules/video_rtp_stream.xml
index f69c654436..4e511321d1 100644
--- a/conf/modules/video_rtp_stream.xml
+++ b/conf/modules/video_rtp_stream.xml
@@ -27,7 +27,7 @@
   </header>
 
   <init fun="viewvideo_init()"/>
-  <makefile target="ap">
+  <makefile target="ap|nps">
 
     <file name="viewvideo.c"/>
 
@@ -44,13 +44,11 @@
       VIEWVID_CFLAGS  = -DVIEWVIDEO_HOST=$(VIEWVIDEO_HOST) -DVIEWVIDEO_PORT_OUT=$(VIEWVIDEO_PORT_OUT)
       ifeq ($(VIEWVIDEO_USE_NC),)
         ap.CFLAGS += $(VIEWVID_CFLAGS) -DVIEWVIDEO_BROADCAST=$(VIEWVIDEO_BROADCAST)
+        nps.CFLAGS += $(VIEWVID_CFLAGS) -DVIEWVIDEO_BROADCAST=FALSE
       else
-        ap.CFLAGS += $(VIEWVID_CFLAGS) -DVIEWVIDEO_USE_NC
+        $(TARGET).CFLAGS += $(VIEWVID_CFLAGS) -DVIEWVIDEO_USE_NC
       endif
     </raw>
 
   </makefile>
-  <makefile target="nps">
-    <file name="viewvideo_nps.c"/>
-  </makefile>
 </module>
diff --git a/conf/modules/video_thread.xml b/conf/modules/video_thread.xml
index 81e52b1d7a..85b5865571 100644
--- a/conf/modules/video_thread.xml
+++ b/conf/modules/video_thread.xml
@@ -48,5 +48,9 @@
   </makefile>
   <makefile target="nps">
     <file name="video_thread_nps.c"/>
+    <file name="cv.c"/>
+    <file name="image.c" dir="modules/computer_vision/lib/vision"/>
+    <file name="jpeg.c" dir="modules/computer_vision/lib/encoding"/>
+    <flag name="LDFLAGS" value="lpthread"/>
   </makefile>
 </module>