diff --git a/trunk/gpgmeplug/ChangeLog b/trunk/gpgmeplug/ChangeLog
index 02ab8e4d..ae94e6bd 100644
--- a/trunk/gpgmeplug/ChangeLog
+++ b/trunk/gpgmeplug/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-15  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgmeplug.c: Renamed to ...
+	* gpgme-openpgp.c: ... this.  New file.
+	* gpgsmplug.c: Renamed to ...
+	* gpgme-smime.c: ... this.  new file.
+	* Makefile.am: Rewritten to use libtool's module functionality.
+
 2001-12-19  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (lib_LTLIBRARIES): Rename to ...
diff --git a/trunk/gpgmeplug/Makefile.am b/trunk/gpgmeplug/Makefile.am
index a55cc24b..3bad5bb8 100644
--- a/trunk/gpgmeplug/Makefile.am
+++ b/trunk/gpgmeplug/Makefile.am
@@ -23,18 +23,14 @@
 #
 ## Process this file with automake to produce Makefile.in
 
-
 INCLUDES = -I$(top_srcdir)/gpgme
 
-libgpgmeplug_la_LIBADD = ../gpgme/libgpgme.la
-libgpgsmplug_la_LIBADD = ../gpgme/libgpgme.la
+pkglib_LTLIBRARIES = gpgme-openpgp.la gpgme-smime.la
 
-BUILT_SOURCES =
+gpgme_openpgp_la_SOURCES = cryptplug.h gpgmeplug.c
+gpgme_openpgp_la_LIBADD = ../gpgme/libgpgme.la
+gpgme_openpgp_la_LDFLAGS = -module -avoid-version
 
-noinst_LTLIBRARIES = libgpgmeplug.la libgpgsmplug.la
-
-libgpgmeplug_la_LDFLAGS = -shared -Wl,-soname,libgpgmeplug.so
-libgpgsmplug_la_LDFLAGS = -shared -Wl,-soname,libgpgsmplug.so
-
-libgpgmeplug_la_SOURCES = cryptplug.h gpgmeplug.c
-libgpgsmplug_la_SOURCES = cryptplug.h gpgsmplug.c
+gpgme_smime_la_SOURCES = cryptplug.h gpgme-smime.c
+gpgme_smime_la_LIBADD = ../gpgme/libgpgme.la
+gpgme_smime_la_LDFLAGS = -module -avoid-version
diff --git a/trunk/gpgmeplug/gpgsmplug.c b/trunk/gpgmeplug/gpgme-smime.c
similarity index 100%
rename from trunk/gpgmeplug/gpgsmplug.c
rename to trunk/gpgmeplug/gpgme-smime.c