diff -uNr gnokii-0.6.18/configure gnokii-0.6.18-new/configure
--- gnokii-0.6.18/configure	2007-07-24 16:31:57.000000000 -0400
+++ gnokii-0.6.18-new/configure	2007-09-28 12:00:21.000000000 -0400
@@ -28430,7 +28430,7 @@
 _ACEOF
 
 		USE_BLUETOOTH="yes"
-		LIBS="$LIBS $PTHREAD_LIBS -framework CoreFoundation -framework IOBluetooth -framework Foundation"
+		LIBS="$LIBS $PTHREAD_LIBS -Wl,-framework,CoreFoundation -Wl,-framework,IOBluetooth -Wl,-framework,Foundation"
 	fi
 fi
 
diff -uNr gnokii-0.6.18/xgnokii/xgnokii_lowlevel.h gnokii-0.6.18-new/xgnokii/xgnokii_lowlevel.h
--- gnokii-0.6.18/xgnokii/xgnokii_lowlevel.h	2007-07-24 16:31:37.000000000 -0400
+++ gnokii-0.6.18-new/xgnokii/xgnokii_lowlevel.h	2007-09-28 12:00:47.000000000 -0400
@@ -230,6 +230,6 @@
 extern void GUI_InsertEvent(PhoneEvent * event);
 extern gn_error GUI_InitSMSFolders(void);
 extern int isSMSactivated;
-struct gn_statemachine *statemachine;
+extern struct gn_statemachine *statemachine;
 
 #endif