diff -uNr boxee-0.9.11.5591-src/configure.in boxee-0.9.11.5591-src/configure.in
--- boxee-0.9.11.5591-src/configure.in	2008-10-31 02:29:00.000000000 +1100
+++ boxee-0.9.11.5591-src/configure.in	2009-04-10 09:19:50.867390415 +1000
@@ -340,6 +340,7 @@
                 [tools/XBMCTex/Makefile]
                 [xbmc/cores/dvdplayer/Codecs/Makefile]
                 [xbmc/lib/cximage-6.0/Makefile]
+                [xbmc/lib/cximage-6.0/Makefile.include]
                 [xbmc/cores/paplayer/MACDll/Makefile]
                 [xbmc/cores/paplayer/MIDCodec/Makefile]
 		[xbmc/cores/paplayer/AACCodec/Makefile]
diff -uNr boxee-0.9.11.5591-src/Makefile.in boxee-0.9.11.5591-src/Makefile.in
--- boxee-0.9.11.5591-src/Makefile.in	2009-02-21 21:44:10.000000000 +1100
+++ boxee-0.9.11.5591-src/Makefile.in	2009-04-10 09:11:58.377289821 +1000
@@ -285,7 +285,7 @@
 $(wildcard $(OBJSXBMC)) :| compile
 
 LIBS += xbmc/lib/libBoxee/libBoxee.a xbmc/lib/libBoxee/libtxpath.a -lcurl
-LIBS += xbmc/lib/libsmb/libtalloc-i486-linux.a xbmc/lib/libsmb/libtdb-i486-linux.a  xbmc/lib/libsmb/libsmbsharemodes-i486-linux.a xbmc/lib/libsmb/libwbclient-i486-linux.a
+LIBS += xbmc/lib/libsmb/libtalloc-@ARCH@.a xbmc/lib/libsmb/libtdb-@ARCH@.a  xbmc/lib/libsmb/libsmbsharemodes-@ARCH@.a xbmc/lib/libsmb/libwbclient-@ARCH@.a
 
 Boxee: $(wildcard $(OBJSXBMC)) $(LIBS) | compile
 	g++ $(DEBUG_FLAGS) -o Boxee $(OBJSXBMC) $(LIBS) -rdynamic
diff -uNr boxee-0.9.11.5591-src/system/rtorrent.rc.linux boxee-0.9.11.5591-src/system/rtorrent.rc.linux
--- boxee-0.9.11.5591-src/system/rtorrent.rc.linux	2008-08-04 17:27:47.000000000 +1000
+++ boxee-0.9.11.5591-src/system/rtorrent.rc.linux	2009-04-10 09:18:36.408266178 +1000
@@ -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
diff -uNr boxee-0.9.11.5591-src/tools/Linux/boxee.desktop boxee-0.9.11.5591-src/tools/Linux/boxee.desktop
--- boxee-0.9.11.5591-src/tools/Linux/boxee.desktop	1970-01-01 10:00:00.000000000 +1000
+++ boxee-0.9.11.5591-src/tools/Linux/boxee.desktop	2009-04-10 09:13:40.003694670 +1000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Boxee
+Comment=Boxee social media center
+Exec=/opt/bin/boxee
+Icon=boxee.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;Player;
+StartupNotify=true
diff -uNr boxee-0.9.11.5591-src/xbmc/app/Makefile boxee-0.9.11.5591-src/xbmc/app/Makefile
--- boxee-0.9.11.5591-src/xbmc/app/Makefile	2009-02-24 23:38:07.000000000 +1100
+++ boxee-0.9.11.5591-src/xbmc/app/Makefile	2009-04-10 11:54:58.147271831 +1000
@@ -1,6 +1,7 @@
-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
+SRCS+= XAPP_Edit.cpp
 
 include ../../Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff -uNr boxee-0.9.11.5591-src/xbmc/FileSystem/FileCurl.cpp boxee-0.9.11.5591-src/xbmc/FileSystem/FileCurl.cpp
--- boxee-0.9.11.5591-src/xbmc/FileSystem/FileCurl.cpp	2009-03-04 11:19:03.000000000 +1100
+++ boxee-0.9.11.5591-src/xbmc/FileSystem/FileCurl.cpp	2009-04-10 09:27:05.661270574 +1000
@@ -404,7 +404,7 @@
   if( m_ftpport.length() > 0 )
     g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, m_ftpport.c_str());
   else
-    g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, NULL);
+    g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, (void*)NULL);
 
   // allow curl to not use the ip address in the returned pasv response
   if( m_ftppasvip )
@@ -804,7 +804,7 @@
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 0);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEFUNCTION, (void*)dummy_callback);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FOLLOWLOCATION, 1);
-  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, NULL); /* will cause write failure*/
+  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, (void*)NULL); /* will cause write failure*/
   
   char err[4096];
   memset(err,0,4096);
diff -uNr boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/Makefile.include.in boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/Makefile.include.in
--- boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/Makefile.include.in	1970-01-01 10:00:00.000000000 +1000
+++ boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/Makefile.include.in	2009-04-10 09:28:20.956262359 +1000
@@ -0,0 +1,13 @@
+ARCH=@ARCH@
+CFLAGS+=-O2
+
+ifeq ($(ARCH), x86_64-linux)
+    CFLAGS+=-fPIC
+    CXXFLAGS+=$(CFLAGS)
+endif
+
+ifeq ($(ARCH), osx)
+   CFLAGS+= -fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/opt/local/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DXBMC -DNO_LCMS -DNO_JPEG
+   CXXFLAGS+= $(CFLAGS)
+endif
+
diff -uNr boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/tiff/Makefile boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/tiff/Makefile
--- boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/tiff/Makefile	2008-09-14 21:27:02.000000000 +1000
+++ boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/tiff/Makefile	2009-04-10 09:30:37.633304076 +1000
@@ -2,6 +2,10 @@
 
 OBJS=fax3sm_winnt.o tif_aux.o tif_close.o tif_codec.o tif_compress.o tif_dir.o tif_dirinfo.o tif_dirread.o tif_dirwrite.o tif_dumpmode.o tif_error.o tif_fax3.o tif_flush.o tif_getimage.o tif_jpeg.o tif_luv.o tif_lzw.o tif_next.o tif_ojpeg.o tif_open.o tif_packbits.o tif_pixarlog.o tif_predict.o tif_print.o tif_read.o tif_strip.o tif_swab.o tif_thunder.o tif_tile.o tif_version.o tif_warning.o tif_write.o tif_zip.o
 
+ifeq ($(ARCH), x86_64-linux)
+    CFLAGS+= -fPIC
+endif
+
 %o : %c
 	$(CC) $(CFLAGS) -c -o $@ $< 
 
diff -uNr boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile
--- boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile	2008-07-14 18:59:49.000000000 +1000
+++ boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile	2009-04-10 11:30:54.805570379 +1000
@@ -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
 
diff -uNr boxee-0.9.11.5591-src/xbmc/lib/libPython/Python/Modules/readline.c boxee-0.9.11.5591-src/xbmc/lib/libPython/Python/Modules/readline.c
--- boxee-0.9.11.5591-src/xbmc/lib/libPython/Python/Modules/readline.c	2008-07-09 18:03:25.000000000 +1000
+++ boxee-0.9.11.5591-src/xbmc/lib/libPython/Python/Modules/readline.c	2009-04-10 14:44:39.007262083 +1000
@@ -36,6 +36,8 @@
 #ifdef HAVE_RL_COMPLETION_MATCHES
 #define completion_matches(x, y) \
 	rl_completion_matches((x), ((rl_compentry_func_t *)(y)))
+#else
+extern char **completion_matches(char *, rl_compentry_func_t *);
 #endif
 
 
@@ -634,7 +636,7 @@
 /* C function to call the Python completer. */
 
 static char *
-on_completion(char *text, int state)
+on_completion(const char *text, int state)
 {
 	char *result = NULL;
 	if (completer != NULL) {
diff -uNr boxee-0.9.11.5591-src/xbmc/Makefile boxee-0.9.11.5591-src/xbmc/Makefile
--- boxee-0.9.11.5591-src/xbmc/Makefile	2009-03-05 06:09:52.000000000 +1100
+++ boxee-0.9.11.5591-src/xbmc/Makefile	2009-04-10 11:39:18.723389401 +1000
@@ -215,6 +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
diff -uNr boxee-0.9.11.5591-src/xbmc/utils/md5.h boxee-0.9.11.5591-src/xbmc/utils/md5.h
--- boxee-0.9.11.5591-src/xbmc/utils/md5.h	2008-07-27 18:09:47.000000000 +1000
+++ boxee-0.9.11.5591-src/xbmc/utils/md5.h	2009-04-10 09:34:38.405396766 +1000
@@ -44,7 +44,11 @@
 #include "StdString.h"
 
 /* typedef a 32 bit type */
-typedef unsigned long int UINT4;
+#ifdef _WIN32PC
+typedef __int32 UINT4;
+#else
+typedef uint32_t UINT4;
+#endif
 
 /* Data structure for MD5 (Message Digest) computation */
 typedef struct {