diff -p -up gnome-pilot-2.0.17/applet/Makefile.am.fix-linking gnome-pilot-2.0.17/applet/Makefile.am
--- gnome-pilot-2.0.17/applet/Makefile.am.fix-linking	2008-06-22 17:35:00.000000000 +0200
+++ gnome-pilot-2.0.17/applet/Makefile.am	2009-08-11 14:42:07.000000000 +0200
@@ -22,6 +22,7 @@ gpilot_applet_SOURCES =		\
 
 gpilot_applet_LDADD = 				\
 	$(GNOME_PILOT_LIBS)			\
+	$(LIBGLADE_LIBS)			\
 	$(PILOT_APPLET_LIBS)		\
 	$(top_builddir)/gpilotd/libgpilotd.la
 
@@ -33,6 +34,7 @@ gpilot_applet_LDADD = 				\
 INCLUDES = 						\
 	-I$(top_srcdir)					\
 	$(GNOME_PILOT_CFLAGS)				\
+	$(LIBGLADE_CFLAGS)				\
 	$(PILOT_APPLET_CFLAGS)			\
 	-DGLADEDATADIR=\""$(gladedir)"\" 		\
 	-DPREFIX=\""$(prefix)\"" 			\
diff -p -up gnome-pilot-2.0.17/capplet/Makefile.am.fix-linking gnome-pilot-2.0.17/capplet/Makefile.am
--- gnome-pilot-2.0.17/capplet/Makefile.am.fix-linking	2008-10-06 22:36:34.000000000 +0200
+++ gnome-pilot-2.0.17/capplet/Makefile.am	2009-08-11 14:41:17.000000000 +0200
@@ -6,6 +6,7 @@ INCLUDES = 						\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gpilotd				\
 	$(GNOME_PILOT_CFLAGS) 				\
+	$(LIBGLADE_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
 	-DGLADEDATADIR=\""$(gladedir)"\" 		\
 	$(NULL)
@@ -36,6 +37,7 @@ gpilotd_control_applet_LDADD = \
 	$(top_builddir)/gpilotd/libgpilotdconduit.la    	\
 	$(top_builddir)/gpilotd/libgpilotdcm.la    	\
 	$(GNOME_PILOT_LIBS) 					\
+	$(LIBGLADE_LIBS) 					\
 	$(NULL)
 
 desktopdir = $(datadir)/applications
diff -p -up gnome-pilot-2.0.17/configure.in.fix-linking gnome-pilot-2.0.17/configure.in
--- gnome-pilot-2.0.17/configure.in.fix-linking	2008-10-06 23:45:30.000000000 +0200
+++ gnome-pilot-2.0.17/configure.in	2009-08-11 14:40:28.000000000 +0200
@@ -163,7 +163,6 @@ PKG_CHECK_MODULES(GNOME_PILOT, 
 	$LIBXML_REQUIRED
 	$LIBGNOME_REQUIRED
 	$LIBGNOMEUI_REQUIRED
-	$LIBGLADE_REQUIRED
 	$LIBBONOBO_REQUIRED
 	$ORBIT_REQUIRED
 	$BONOBO_ACTIVATION_REQUIRED
@@ -171,12 +170,17 @@ PKG_CHECK_MODULES(GNOME_PILOT, 
 	$GCONF_REQUIRED
 ])
 
+PKG_CHECK_MODULES(LIBGLADE, $LIBGLADE_REQUIRED)
+
 GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
-GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS $HAL_LIBS"
+GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS"
 
 AC_SUBST(GNOME_PILOT_CFLAGS)
 AC_SUBST(GNOME_PILOT_LIBS)
 
+AC_SUBST(LIBGLADE_CFLAGS)
+AC_SUBST(LIBGLADE_LIBS)
+
 PKG_CHECK_MODULES(PILOT_APPLET,
 [
 	$LIBPANELAPPLET_REQUIRED
diff -p -up gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-linking gnome-pilot-2.0.17/gpilotd/Makefile.am
--- gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-linking	2009-01-07 23:36:13.000000000 +0100
+++ gnome-pilot-2.0.17/gpilotd/Makefile.am	2009-08-11 14:38:06.000000000 +0200
@@ -220,6 +220,7 @@ gpilotd_LDADD = libgpilotdconduit.la lib
 		./libgpilotdcm.la 	\
 		./libgpilotd.la				\
 		$(GNOME_PILOT_LIBS) 			\
+		$(HAL_LIBS)				\
 		$(NULL)
 
 gpilotd_session_wrapper_SOURCES = 		\