diff --git a/flight/targets/boards/revoproto/firmware/Makefile b/flight/targets/boards/revoproto/firmware/Makefile
index e282fc35b..2e5df1ac3 100644
--- a/flight/targets/boards/revoproto/firmware/Makefile
+++ b/flight/targets/boards/revoproto/firmware/Makefile
@@ -29,25 +29,26 @@ USE_DSP_LIB ?= NO
 
 # List of mandatory modules to include
 MODULES += Sensors
-MODULES += Attitude/revolution
-#MODULES += StateEstimation # use instead of Attitude
+#MODULES += Attitude/revolution
+MODULES += StateEstimation # use instead of Attitude
 MODULES += Altitude/revolution
 MODULES += Airspeed
 MODULES += AltitudeHold
 MODULES += Stabilization
-MODULES += Receiver
+MODULES += VtolPathFollower
 MODULES += ManualControl
+MODULES += Receiver
 MODULES += Actuator
 MODULES += GPS
+MODULES += TxPID
 MODULES += CameraStab
+MODULES += Battery
 MODULES += FirmwareIAP
 MODULES += PathPlanner
 MODULES += FixedWingPathFollower
-#MODULES += OveroSync ## OveroSync disabled until OP292 is fixed
+MODULES += Osd/osdoutout
+MODULES += Logging
 MODULES += Telemetry
-#MODULES += VtolPathFollower  ## OP-700: VtolPathFollower disabled because its currently unsafe - remove this line once Sambas code has been merged
-#MODULES += Battery
-#MODULES += TxPID
 
 OPTMODULES += ComUsbBridge
 
diff --git a/flight/targets/boards/revoproto/firmware/UAVObjects.inc b/flight/targets/boards/revoproto/firmware/UAVObjects.inc
index 566c3820b..72f51cbec 100644
--- a/flight/targets/boards/revoproto/firmware/UAVObjects.inc
+++ b/flight/targets/boards/revoproto/firmware/UAVObjects.inc
@@ -1,9 +1,5 @@
-#####
-# Project: OpenPilot
 #
-# Makefile for OpenPilot UAVObject code
-#
-# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2011.
+# Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +14,10 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#####
+#
 
 # These are the UAVObjects supposed to be build as part of the OpenPilot target
 # (all architectures)
-
 UAVOBJSRCFILENAMES =
 UAVOBJSRCFILENAMES += accelgyrosettings
 UAVOBJSRCFILENAMES += accessorydesired
@@ -35,12 +30,16 @@ UAVOBJSRCFILENAMES += gyrostate
 UAVOBJSRCFILENAMES += gyrosensor
 UAVOBJSRCFILENAMES += accelstate
 UAVOBJSRCFILENAMES += accelsensor
-UAVOBJSRCFILENAMES += magstate
 UAVOBJSRCFILENAMES += magsensor
+UAVOBJSRCFILENAMES += magstate
 UAVOBJSRCFILENAMES += barosensor
 UAVOBJSRCFILENAMES += airspeedsensor
 UAVOBJSRCFILENAMES += airspeedsettings
 UAVOBJSRCFILENAMES += airspeedstate
+UAVOBJSRCFILENAMES += debuglogsettings
+UAVOBJSRCFILENAMES += debuglogcontrol
+UAVOBJSRCFILENAMES += debuglogstatus
+UAVOBJSRCFILENAMES += debuglogentry
 UAVOBJSRCFILENAMES += flightbatterysettings
 UAVOBJSRCFILENAMES += firmwareiapobj
 UAVOBJSRCFILENAMES += flightbatterystate
@@ -67,6 +66,7 @@ UAVOBJSRCFILENAMES += mixersettings
 UAVOBJSRCFILENAMES += mixerstatus
 UAVOBJSRCFILENAMES += nedaccel
 UAVOBJSRCFILENAMES += objectpersistence
+UAVOBJSRCFILENAMES += oplinkreceiver
 UAVOBJSRCFILENAMES += overosyncstats
 UAVOBJSRCFILENAMES += overosyncsettings
 UAVOBJSRCFILENAMES += pathaction
@@ -102,6 +102,8 @@ UAVOBJSRCFILENAMES += receiveractivity
 UAVOBJSRCFILENAMES += cameradesired
 UAVOBJSRCFILENAMES += camerastabsettings
 UAVOBJSRCFILENAMES += altitudeholdsettings
+UAVOBJSRCFILENAMES += oplinksettings
+UAVOBJSRCFILENAMES += oplinkstatus
 UAVOBJSRCFILENAMES += altitudefiltersettings
 UAVOBJSRCFILENAMES += altitudeholddesired
 UAVOBJSRCFILENAMES += altitudeholdstatus
@@ -110,6 +112,7 @@ UAVOBJSRCFILENAMES += waypointactive
 UAVOBJSRCFILENAMES += poilocation
 UAVOBJSRCFILENAMES += poilearnsettings
 UAVOBJSRCFILENAMES += mpu6000settings
+UAVOBJSRCFILENAMES += txpidsettings
 
 UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(OPUAVSYNTHDIR)/$(UAVOBJSRCFILE).c )
 UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) )