diff -Naur dspam-3.6.6/src/dspam.conf.in dspam-3.6.6.oden/src/dspam.conf.in
--- dspam-3.6.6/src/dspam.conf.in	2006-05-14 17:40:44.000000000 +0200
+++ dspam-3.6.6.oden/src/dspam.conf.in	2006-05-14 22:17:46.000000000 +0200
@@ -23,7 +23,7 @@
 # this option. If you do not wish to lose all of your data, you will need to
 # migrate it to the new backend before making this change.
 #
-StorageDriver @libdir@/@storage_driver@
+StorageDriver @libdir@/dspam/@storage_driver@
 
 #
 # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call 
diff -Naur dspam-3.6.6/src/Makefile.am dspam-3.6.6.oden/src/Makefile.am
--- dspam-3.6.6/src/Makefile.am	2006-05-14 17:40:04.000000000 +0200
+++ dspam-3.6.6.oden/src/Makefile.am	2006-05-14 22:20:40.000000000 +0200
@@ -139,46 +139,40 @@
 	mysql_drv.c mysql_drv.h 
 libmysql_drv_la_LIBADD = $(libmysql_drv_libs)
 libmysql_drv_la_CPPFLAGS = $(libmysql_drv_cppflags)
-libmysql_drv_la_LDFLAGS = $(libmysql_drv_ldflags)
-libmysql_drv_la_LDFLAGS += -rpath '$(libdir)' -version-info $(libversion) 
+libmysql_drv_la_LDFLAGS = -rpath '$(libdir)' -avoid-version
 libmysql_drv_la_DEPENDENCIES =
 
 libpgsql_drv_la_SOURCES = \
 	pgsql_drv.c pgsql_drv.h 
 libpgsql_drv_la_LIBADD = $(libpgsql_drv_libs)
 libpgsql_drv_la_CPPFLAGS = $(libpgsql_drv_cppflags)
-libpgsql_drv_la_LDFLAGS = $(libpgsql_drv_ldflags)
-libpgsql_drv_la_LDFLAGS += -rpath '$(libdir)' -version-info $(libversion)
+libpgsql_drv_la_LDFLAGS = -rpath '$(libdir)' -avoid-version
 libpgsql_drv_la_DEPENDENCIES =
 
 libora_drv_la_SOURCES = \
         ora_drv.c ora_drv.h 
 libora_drv_la_LIBADD = $(libora_drv_libs)
 libora_drv_la_CPPFLAGS = $(libora_drv_cppflags)
-libora_drv_la_LDFLAGS = $(libora_drv_ldflags)
-libora_drv_la_LDFLAGS += -rpath '$(libdir)' -version-info $(libversion)
+libora_drv_la_LDFLAGS = -rpath '$(libdir)' -avoid-version
 libora_drv_la_DEPENDENCIES =
 
 libsqlite_drv_la_SOURCES = \
 	sqlite_drv.c sqlite_drv.h 
 libsqlite_drv_la_LIBADD = $(libsqlite_drv_libs)
 libsqlite_drv_la_CPPFLAGS = $(libsqlite_drv_cppflags)
-libsqlite_drv_la_LDFLAGS = $(libsqlite_drv_ldflags)
-libsqlite_drv_la_LDFLAGS += -rpath '$(libdir)' -version-info $(libversion)
+libsqlite_drv_la_LDFLAGS = -rpath '$(libdir)' -avoid-version
 libsqlite_drv_la_DEPENDENCIES =
 
 libsqlite3_drv_la_SOURCES = \
 	sqlite3_drv.c sqlite3_drv.h 
 libsqlite3_drv_la_LIBADD = $(libsqlite3_drv_libs)
 libsqlite3_drv_la_CPPFLAGS = $(libsqlite3_drv_cppflags)
-libsqlite3_drv_la_LDFLAGS = $(libsqlite3_drv_ldflags)
-libsqlite3_drv_la_LDFLAGS += -rpath '$(libdir)' -version-info $(libversion)
+libsqlite3_drv_la_LDFLAGS = -rpath '$(libdir)' -avoid-version
 libsqlite3_drv_la_DEPENDENCIES =
 
 libhash_drv_la_SOURCES = \
 	hash_drv.c hash_drv.h
-libhash_drv_la_LDFLAGS = -rpath '$(libdir)' 
-libhash_drv_la_LDFLAGS += -version-info $(libversion)
+libhash_drv_la_LDFLAGS = -rpath '$(libdir)/dspam' -avoid-version
 
 endif