diff --git a/mythtv/filters/filter-avcodec.pro b/mythtv/filters/filter-avcodec.pro
index 802d900..677b76d 100644
--- a/mythtv/filters/filter-avcodec.pro
+++ b/mythtv/filters/filter-avcodec.pro
@@ -3,7 +3,9 @@ include(../settings.pro)

 LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
 LIBS += -L../../external/FFmpeg/libavutil  -lmythavutil
+LIBS += -L../../external/FFmpeg/libavformat  -lmythavformat

 # Rebuild (link) this filter if the lib changes
 POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
 POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
+POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
diff --git a/mythtv/filters/kerneldeint/kerneldeint.pro b/mythtv/filters/kerneldeint/kerneldeint.pro
index 4c784a6..0f19295 100644
--- a/mythtv/filters/kerneldeint/kerneldeint.pro
+++ b/mythtv/filters/kerneldeint/kerneldeint.pro
@@ -5,6 +5,7 @@ LIBS += -lmyth-$${LIBVERSION} -L../../libs/libmyth
 LIBS += -lmythbase-$${LIBVERSION} -L../../libs/libmythbase
 macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui
 macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp
+macx:LIBS += -lmythservicecontracts-$${LIBVERSION} -L../../libs/libmythservicecontracts
 mingw:LIBS += $$EXTRA_LIBS

 # Input
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
index bde661a..ae0ac08 100644
--- a/mythtv/libs/libmyth/libmyth.pro
+++ b/mythtv/libs/libmyth/libmyth.pro
@@ -88,6 +88,7 @@ LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
 LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
 LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
+LIBS += -L../libmythservicecontracts -lmythservicecontracts-$${LIBVERSION}
 LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
 LIBS += -L../../external/FFmpeg/libavutil  -lmythavutil
 LIBS += -L../../external/FFmpeg/libavformat  -lmythavformat
diff --git a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
index 4d89199..3b6331c 100644
--- a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
+++ b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
@@ -29,14 +29,47 @@ INCLUDEPATH += ../libmythbase ../libmyth ../libmythtv ../libmythui
 INCLUDEPATH += ../../external/FFmpeg ../.. ../ ./

 DEPENDPATH += ../ ../libmythbase ../libmythtv ../libmyth ../libmythui
+DEPENDPATH += ../libmythupnp ../libmythservicecontracts

 LIBS += -L../libmythbase -L../libmyth -L../libmythtv -L../libmythui
-LIBS += -L../../external/FFmpeg/libavutil
+LIBS += -L../libmythupnp -L../libmythservicecontracts -L../libmythfreemheg
+LIBS += -L../libmythlivemedia -L../libmythhdhomerun
+LIBS += -L../../external/FFmpeg/libavutil -L../../external/FFmpeg/libavcodec
+LIBS += -L../../external/FFmpeg/libavformat -L../../external/FFmpeg/libswscale
 LIBS += -lmythbase-$$LIBVERSION -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION
-LIBS += -lmythtv-$$LIBVERSION
-LIBS += -lmythavutil
+LIBS += -lmythtv-$$LIBVERSION -lmythupnp-$$LIBVERSION
+LIBS += -lmythservicecontracts-$$LIBVERSION -lmythfreemheg-$$LIBVERSION
+LIBS += -lmythlivemedia-$$LIBVERSION -lmythhdhomerun-$$LIBVERSION
+LIBS += -lmythavutil -lmythavcodec -lmythavformat -lmythswscale
 LIBS += $$EXTRA_LIBS $$LATE_LIBS $$QMAKE_LIBS_DYNLOAD

+macx {
+    # Mac OS X Frameworks
+    FWKS = AGL ApplicationServices Carbon Cocoa CoreFoundation OpenGL QuickTime IOKit
+    using_quartz_video {
+        FWKS += QuartzCore
+    } else {
+        FWKS += CoreVideo
+    }
+
+    using_firewire:using_backend: FWKS += IOKit
+
+    # The following trick shortens the command line, but depends on
+    # the shell expanding Csh-style braces. Luckily, Bash and Zsh do.
+    FC = $$join(FWKS,",","{","}")
+
+    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/$${FC}.framework/Frameworks
+    LIBS           += -framework $$join(FWKS," -framework ")
+
+    using_firewire:using_backend {
+        QMAKE_CXXFLAGS += -F$${CONFIG_MAC_AVC}
+        LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
+        # Recent versions of this framework use /usr/lib/libstdc++.6.dylib
+        # which may clash with symbols in /usr/lib/gcc/darwin/3.3/libstdc++.a
+        # In that case, rebuild the framework with your (old) Xcode version
+    }
+}
+
 inc.path = $${PREFIX}/include/mythtv/protoserver

 inc.files = $HEADERS
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index 8e0b839..27dc137 100644
--- a/mythtv/libs/libmythtv/libmythtv.pro
+++ b/mythtv/libs/libmythtv/libmythtv.pro
@@ -50,6 +50,7 @@ LIBS += -L../libmythui -L../libmythupnp
 LIBS += -L../libmythdvdnav
 LIBS += -L../libmythbluray
 LIBS += -L../libmythbase
+LIBS += -L../libmythservicecontracts
 LIBS += -lmyth-$$LIBVERSION
 LIBS += -lmythswscale
 LIBS += -lmythavformat
@@ -58,6 +59,7 @@ LIBS += -lmythavutil
 LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
 LIBS += -lmythdvdnav-$$LIBVERSION
 LIBS += -lmythbluray-$$LIBVERSION    -lmythbase-$$LIBVERSION
+LIBS += -lmythservicecontracts-$$LIBVERSION
 using_mheg: LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
 using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
 using_hdhomerun: LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION