--- Expense/Makefile.am~	2006-09-04 21:45:03.000000000 +0200
+++ Expense/Makefile.am	2009-06-15 05:26:43.000000000 +0200
@@ -7,6 +7,7 @@
 lib_LTLIBRARIES = libexpense.la
 libexpense_la_SOURCES = expense.c
 libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-libexpense_la_LDFLAGS = @GTK_LIBS@
+libexpense_la_LIBADD = @GTK_LIBS@
+libexpense_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
 
 endif
--- Expense/Makefile.in~	2009-02-15 22:18:34.000000000 +0100
+++ Expense/Makefile.in	2009-06-15 05:36:03.000000000 +0200
@@ -248,7 +248,8 @@
 @MAKE_EXPENSE_TRUE@lib_LTLIBRARIES = libexpense.la
 @MAKE_EXPENSE_TRUE@libexpense_la_SOURCES = expense.c
 @MAKE_EXPENSE_TRUE@libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = @GTK_LIBS@
+@MAKE_EXPENSE_TRUE@libexpense_la_LIBADD = @GTK_LIBS@
+@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
 all: all-am
 
 .SUFFIXES:
--- KeyRing/Makefile.am~	2008-12-13 16:28:55.000000000 +0100
+++ KeyRing/Makefile.am	2009-06-15 05:37:38.000000000 +0200
@@ -11,6 +11,7 @@
 libkeyring_la_SOURCES = keyring.c
 
 libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir)
-libkeyring_la_LDFLAGS = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
+libkeyring_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
+libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
 
 endif
--- KeyRing/Makefile.in~	2009-02-15 22:18:34.000000000 +0100
+++ KeyRing/Makefile.in	2009-06-15 05:38:15.000000000 +0200
@@ -249,7 +249,8 @@
 @MAKE_KEYRING_TRUE@lib_LTLIBRARIES = libkeyring.la
 @MAKE_KEYRING_TRUE@libkeyring_la_SOURCES = keyring.c
 @MAKE_KEYRING_TRUE@libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir)
-@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
+@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
+@MAKE_KEYRING_TRUE@libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
 all: all-am
 
 .SUFFIXES:
--- SyncTime/Makefile.am~	2006-09-04 21:45:03.000000000 +0200
+++ SyncTime/Makefile.am	2009-06-15 05:39:21.000000000 +0200
@@ -7,6 +7,7 @@
 lib_LTLIBRARIES = libsynctime.la
 libsynctime_la_SOURCES = synctime.c
 libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-libsynctime_la_LDFLAGS = @GTK_LIBS@
+libsynctime_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
+libsynctime_la_LIBADD = @GTK_LIBS@
 
 endif
--- SyncTime/Makefile.in~	2009-02-15 22:18:34.000000000 +0100
+++ SyncTime/Makefile.in	2009-06-15 05:39:53.000000000 +0200
@@ -248,7 +248,8 @@
 @MAKE_SYNCTIME_TRUE@lib_LTLIBRARIES = libsynctime.la
 @MAKE_SYNCTIME_TRUE@libsynctime_la_SOURCES = synctime.c
 @MAKE_SYNCTIME_TRUE@libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = @GTK_LIBS@
+@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = -module -avoid-version -rpath @prefix@/$(ABILIB)/jpilot/plugins
+@MAKE_SYNCTIME_TRUE@libsynctime_la_LIBADD = @GTK_LIBS@
 all: all-am
 
 .SUFFIXES: