--- boxee-0.9.11.5591-src/xbmc/app/Makefile	2009-02-24 04:38:07.000000000 -0800
+++ boxee-0.9.11.5591-src/xbmc/app/Makefile	2009-04-08 19:20:42.000000000 -0700
@@ -1,6 +1,6 @@
-INCLUDES=-I. -I../ -I../linux -I../../guilib -I../cores -I../utils
+INCLUDES=-I. -I../ -I../linux -I../../guilib -I../cores -I../utils -I../lib -I../lib/libBoxee
 
-SRCS=App_Python_Wrapper.cpp XAPP_App.cpp XAPP_Button.cpp XAPP_Control.cpp XAPP_Image.cpp XAPP_Label.cpp XAPP_List.cpp XAPP_ListItem.cpp XAPP_LocalConfig.cpp XAPP_MC.cpp XAPP_Player.cpp XAPP_PlayList.cpp XAPP_ServerConfig.cpp XAPP_ToggleButton.cpp XAPP_Window.cpp
+SRCS=App_Python_Wrapper.cpp XAPP_App.cpp XAPP_Button.cpp XAPP_Control.cpp XAPP_Image.cpp XAPP_Label.cpp XAPP_List.cpp XAPP_ListItem.cpp XAPP_LocalConfig.cpp XAPP_MC.cpp XAPP_Player.cpp XAPP_PlayList.cpp XAPP_ToggleButton.cpp XAPP_Window.cpp XAPP_Edit.cpp
 
 include ../../Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
--- ./boxee-0.9.11.5591-src/xbmc/cores/dvdplayer/Codecs/libmad/Makefile.in	2009-04-04 00:59:23.000000000 -0700
+++ ./boxee-0.9.11.5591-src/xbmc/cores/dvdplayer/Codecs/libmad/Makefile.in	2009-04-04 00:59:06.000000000 -0700
@@ -126,7 +126,7 @@
 CCAS = @CCAS@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -fPIC -D_LINUX
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
--- boxee-0.9.11.5591-src/xbmc/Makefile	2009-03-04 11:09:52.000000000 -0800
+++ boxee-0.9.11.5591-src/xbmc/Makefile	2009-03-31 22:31:08.000000000 -0700
@@ -215,7 +215,7 @@
 SRCS += ItemLoader.cpp GUIWindowBoxeeBrowse.cpp GUIWindowBoxeeMain.cpp GUIDialogBoxeeMainMenu.cpp GUIDialogBoxeeOptionsMenu.cpp GUIDialogBoxeeMediaAction.cpp GUIWindowBoxeeMediaInfo.cpp
 SRCS += GUIWindowBoxeeMediaSources.cpp GUIWindowBoxeeMediaSourceInfo.cpp GUIWindowBoxeeMediaSourceList.cpp GUIWindowBoxeeMediaSourceAddFolder.cpp GUIWindowBoxeeMediaSourceAddShare.cpp BoxeeMediaSourceList.cpp
 SRCS += GUIDialogBoxeeAppCtx.cpp GUIDialogBoxeePictureCtx.cpp GUIDialogBoxeeLoggingIn.cpp GUIDialogBoxeeCredits.cpp BrowseWindowConfiguration.cpp BrowseWindowFilter.cpp BoxeeItemsHistory.cpp GUIDialogBoxeeManualResolve.cpp GUIWindowBoxeeApplicationSettings.cpp UpdateSourceFile.cpp AppDescriptor.cpp AppManager.cpp GUIWindowApp.cpp AppRegistry.cpp GUIBoxeeViewState.cpp GUIBoxeeViewStateFactory.cpp BoxeeViewDatabase.cpp GUIDialogBoxeeLibraryStatus.cpp AppRepository.cpp AppRepositories.cpp 
-
+SRCS += BoxeeAuthenticator.cpp
 
 LIB=xbmc.a
 
--- boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile	2008-07-14 01:59:49.000000000 -0700
+++ boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile	2009-03-31 22:31:53.000000000 -0700
@@ -1,5 +1,6 @@
 INCLUDES=-I. -I../../ -I../../linux -I../../../guilib -I../../utils -I.
 SRCS=XBPython.cpp XBPythonDll.cpp XBPyThread.cpp XBPythonDllFuncs.S
+SRCS += XBPyPersistentThread.cpp
 
 LIB=python.a
 
--- ./boxee-0.9.11.5591-src.orig/system/rtorrent.rc.linux	2008-08-04 00:27:47.000000000 -0700
+++ ./boxee-0.9.11.5591-src/system/rtorrent.rc.linux	2009-04-08 22:31:47.000000000 -0700
@@ -29,7 +29,7 @@
 # deleted.
 schedule = watch_directory,5,5,load_start=~/.boxee/torrent/*.torrent
 
-on_finished = move_complete,"execute=/bin/mv,-n,$d.get_base_path=,~/.boxee/downloads/ ;d.set_directory=~/.boxee/downloads/"
+on_finished = move_complete,"execute=/bin/mv,-u,$d.get_base_path=,~/.boxee/downloads/ ;d.set_directory=~/.boxee/downloads/"
 
 # Close torrents when diskspace is low.
 schedule = low_diskspace,5,60,close_low_diskspace=100M