diff -Nurd gnokii-0.6.26/common/Makefile.in gnokii-0.6.26-new/common/Makefile.in
--- gnokii-0.6.26/common/Makefile.in	2008-05-30 15:45:56.000000000 -0400
+++ gnokii-0.6.26-new/common/Makefile.in	2008-07-23 09:41:00.000000000 -0400
@@ -357,6 +357,8 @@
 	$(top_builddir)/common/phones/libPHONES.la \
 	$(top_builddir)/common/links/libLINKS.la \
 	$(top_builddir)/common/devices/libDEVICES.la \
+	$(BLUETOOTH_LIBS) \
+	$(INTLLIBS) \
 	$(XPM_LIBS)
 
 libgnokii_la_LDFLAGS = \
diff -Nurd gnokii-0.6.26/common/cfgreader.c gnokii-0.6.26-new/common/cfgreader.c
--- gnokii-0.6.26/common/cfgreader.c	2008-05-30 15:35:10.000000000 -0400
+++ gnokii-0.6.26-new/common/cfgreader.c	2008-07-23 11:08:24.000000000 -0400
@@ -904,7 +904,7 @@
 	strncat(rcfile, homedir ? homedir : "", MAX_PATH_LEN);
 	strncat(rcfile, "\\_gnokiirc", MAX_PATH_LEN);
 #else
-	const char globalrc[] = "/etc/gnokiirc";
+	const char globalrc[] = "@FINKPREFIX@/etc/gnokiirc";
 
 	homedir = getenv("HOME");
 	if (homedir)
diff -Nurd gnokii-0.6.26/configure gnokii-0.6.26-new/configure
--- gnokii-0.6.26/configure	2008-05-30 15:46:08.000000000 -0400
+++ gnokii-0.6.26-new/configure	2008-07-23 08:04:25.000000000 -0400
@@ -25313,7 +25313,7 @@
 _ACEOF
 
 		USE_BLUETOOTH="yes"
-		BLUETOOTH_LIBS="$PTHREAD_LIBS -framework CoreFoundation -framework IOBluetooth -framework Foundation"
+		BLUETOOTH_LIBS="$PTHREAD_LIBS -Wl,-framework,CoreFoundation -Wl,-framework,IOBluetooth -Wl,-framework,Foundation"
 
 	fi
 fi
diff -Nurd gnokii-0.6.26/gnokii/gnokii-utils.c gnokii-0.6.26-new/gnokii/gnokii-utils.c
--- gnokii-0.6.26/gnokii/gnokii-utils.c	2008-03-20 13:49:01.000000000 -0400
+++ gnokii-0.6.26-new/gnokii/gnokii-utils.c	2008-07-23 08:03:55.000000000 -0400
@@ -43,6 +43,7 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <sys/stat.h>
 
 #include "gnokii-app.h"
 #include "gnokii.h"
diff -Nurd gnokii-0.6.26/smsd/Makefile.in gnokii-0.6.26-new/smsd/Makefile.in
--- gnokii-0.6.26/smsd/Makefile.in	2008-05-30 15:46:01.000000000 -0400
+++ gnokii-0.6.26-new/smsd/Makefile.in	2008-07-23 09:56:36.000000000 -0400
@@ -58,7 +58,7 @@
 	"$(DESTDIR)$(man8dir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
-libsmsd_file_la_LIBADD =
+libsmsd_file_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/common/libgnokii.la
 am_libsmsd_file_la_OBJECTS = file.lo utils.lo
 libsmsd_file_la_OBJECTS = $(am_libsmsd_file_la_OBJECTS)
 libsmsd_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -319,7 +319,7 @@
 top_srcdir = @top_srcdir@
 plugindir = $(libdir)/smsd
 plugin_LTLIBRARIES = libsmsd_file.la $(am__append_1) $(am__append_2)
-modules_flags = -avoid-version -module -no-undefined
+modules_flags = -avoid-version -module
 @HAVE_POSTGRES_TRUE@libsmsd_pq_la_SOURCES = pq.c db.h utils.h utils.c
 @HAVE_POSTGRES_TRUE@libsmsd_pq_la_LDFLAGS = $(modules_flags)
 @HAVE_POSTGRES_TRUE@libsmsd_pq_la_LIBADD = $(POSTGRES_LIBS)
diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_data.c gnokii-0.6.26-new/xgnokii/xgnokii_data.c
--- gnokii-0.6.26/xgnokii/xgnokii_data.c	2008-03-20 13:49:03.000000000 -0400
+++ gnokii-0.6.26-new/xgnokii/xgnokii_data.c	2008-07-23 08:03:55.000000000 -0400
@@ -67,7 +67,7 @@
 }
 
 
-inline void GUI_ShowData(void)
+void GUI_ShowData(void)
 {
 	if (!phoneMonitor.supported & PM_DATA)
 		return;
diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_data.h gnokii-0.6.26-new/xgnokii/xgnokii_data.h
--- gnokii-0.6.26/xgnokii/xgnokii_data.h	2007-05-07 14:05:53.000000000 -0400
+++ gnokii-0.6.26-new/xgnokii/xgnokii_data.h	2008-07-23 08:03:55.000000000 -0400
@@ -31,7 +31,7 @@
 #define XGNOKII_DATA_H
 
 void GUI_CreateDataWindow(void);
-inline void GUI_ShowData(void);
+extern void GUI_ShowData(void);
 inline void GUI_HideData(void);
 
 #endif
diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_lowlevel.h gnokii-0.6.26-new/xgnokii/xgnokii_lowlevel.h
--- gnokii-0.6.26/xgnokii/xgnokii_lowlevel.h	2008-03-20 13:49:03.000000000 -0400
+++ gnokii-0.6.26-new/xgnokii/xgnokii_lowlevel.h	2008-07-23 08:03:55.000000000 -0400
@@ -231,6 +231,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