diff --git a/common/Makefile.am b/common/Makefile.am
index 168fbde..96bd174 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -31,7 +31,7 @@ libgkr_common_la_SOURCES = \
 	gkr-wakeup.c gkr-wakeup.h 
 
 libgkr_common_la_LIBADD = \
-	$(top_builddir)/egg/libegg.la \
+	$(top_builddir)/egg/libegg.a \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS)
 
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index eca41c2..406e5a4 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -9,7 +9,7 @@ UNIT_AUTO = \
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/egg/libegg.la \
+	$(top_builddir)/egg/libegg.a \
 	$(top_builddir)/common/libgkr-common.la
 
 include $(top_srcdir)/tests/test.make
diff --git a/daemon/ui/Makefile.am b/daemon/ui/Makefile.am
index 538a18c..10af6df 100644
--- a/daemon/ui/Makefile.am
+++ b/daemon/ui/Makefile.am
@@ -20,8 +20,8 @@ gnome_keyring_ask_SOURCES = \
 	gkr-ask-request.h
 	
 gnome_keyring_ask_LDADD = \
-	$(top_builddir)/egg/libegg-secure.la \
-	$(top_builddir)/egg/libegg-secure-entry.la \
+	$(top_builddir)/egg/libegg-secure.a \
+	$(top_builddir)/egg/libegg-secure-entry.a \
 	$(GTK_LIBS)
 
 noinst_LTLIBRARIES=libgkr-ui.la
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 30b9d32..f0e1091 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -1,10 +1,10 @@
 
-noinst_LTLIBRARIES = \
-	libegg.la \
-	libegg-buffer.la \
-	libegg-creds.la \
-	libegg-secure.la \
-	libegg-secure-entry.la
+noinst_LIBRARIES = \
+	libegg.a \
+	libegg-buffer.a \
+	libegg-creds.a \
+	libegg-secure.a \
+	libegg-secure-entry.a
 
 BUILT_SOURCES = \
 	asn1-def-pk.h asn1-def-pkix.h
@@ -13,11 +13,11 @@ INCLUDES = \
 	-I$(top_srcdir) 
 	-I$(top_builddir) 
 
-libegg_la_CFLAGS = \
+libegg_a_CFLAGS = \
 	$(LIBTASN1_CFLAGS) \
 	$(GLIB_CFLAGS)
 
-libegg_la_SOURCES = \
+libegg_a_SOURCES = \
 	egg-asn1.c egg-asn1.h \
 	egg-buffer.c egg-buffer.h \
 	egg-hex.c egg-hex.h \
@@ -43,21 +43,21 @@ DISTCLEANFILES = \
 # --------------------------------------------------------------------
 # COMMON STUFF COMPILED INTO SMALLER COMPONENTS
  
-libegg_secure_la_SOURCES = \
+libegg_secure_a_SOURCES = \
  	egg-secure-memory.c egg-secure-memory.h
 
-libegg_secure_entry_la_SOURCES = \
+libegg_secure_entry_a_SOURCES = \
  	egg-secure-entry.c egg-secure-entry.h
 
-libegg_secure_entry_la_CFLAGS = \
+libegg_secure_entry_a_CFLAGS = \
 	$(GOBJECT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 	
-libegg_buffer_la_SOURCES = \
+libegg_buffer_a_SOURCES = \
 	egg-buffer.c egg-buffer.h 
  	
-libegg_creds_la_SOURCES = \
+libegg_creds_a_SOURCES = \
 	egg-unix-credentials.c egg-unix-credentials.h	
 
 # -------------------------------------------------------------------
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 655c2c0..bdd4e55 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -17,7 +17,7 @@ UNIT_AUTO = \
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/egg/libegg.la
+	$(top_builddir)/egg/libegg.a
 
 EXTRA_DIST = \
 	test.asn \
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 488225d..33b8b62 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -67,8 +67,8 @@ libgcr_la_LDFLAGS = \
 	-no-undefined -export-symbols-regex 'gcr_*'
     
 libgcr_la_LIBADD = \
-	$(top_builddir)/egg/libegg.la \
-	$(top_builddir)/egg/libegg-secure-entry.la \
+	$(top_builddir)/egg/libegg.a \
+	$(top_builddir)/egg/libegg-secure-entry.a \
 	$(top_builddir)/gp11/libgp11.la \
 	$(GOBJECT_LIBS) \
 	$(GLIB_LIBS) \
diff --git a/gcr/tests/Makefile.am b/gcr/tests/Makefile.am
index 6bc48b3..f98d084 100644
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@ -6,8 +6,8 @@ UNIT_AUTO = \
 
 UNIT_LIBS =  \
 	$(top_builddir)/gcr/libgcr.la \
-	$(top_builddir)/egg/libegg.la \
-	$(top_builddir)/egg/libegg-secure-entry.la \
+	$(top_builddir)/egg/libegg.a \
+	$(top_builddir)/egg/libegg-secure-entry.a \
 	$(top_builddir)/gp11/libgp11.la
 	
 UNIT_FLAGS = \
diff --git a/library/Makefile.am b/library/Makefile.am
index 45fc422..dc198e8 100644
--- a/library/Makefile.am
+++ b/library/Makefile.am
@@ -40,9 +40,9 @@ libgnomekeyringinclude_HEADERS = \
 
 libgnome_keyring_la_LIBADD = \
 	libgnome-keyring-common.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-secure.la \
-	$(top_builddir)/egg/libegg-creds.la \
+	$(top_builddir)/egg/libegg-buffer.a \
+	$(top_builddir)/egg/libegg-secure.a \
+	$(top_builddir)/egg/libegg-creds.a \
 	$(GLIB_LIBS)
 
 libgnome_keyring_la_LDFLAGS = \
diff --git a/library/tests/Makefile.am b/library/tests/Makefile.am
index cacf5fe..1118e73 100644
--- a/library/tests/Makefile.am
+++ b/library/tests/Makefile.am
@@ -11,8 +11,8 @@ UNIT_PROMPT = \
 	unit-test-daemon-setup.c
 
 UNIT_LIBS =  \
-	$(top_builddir)/egg/libegg.la \
-	$(top_builddir)/library/libgnome-keyring.la
+	$(top_builddir)/egg/libegg.a \
+	$(top_builddir)/library/libgnome-keyring.a
 
 UNIT_FLAGS = \
 	-DEXTERNAL_TEST
diff --git a/pam/Makefile.am b/pam/Makefile.am
index 32f1e7c..f2f419e 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -13,9 +13,9 @@ pam_gnome_keyring_la_SOURCES = \
 	gkr-pam-stubs.c
 
 pam_gnome_keyring_la_LIBADD = \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la \
-	$(top_builddir)/egg/libegg-secure.la \
+	$(top_builddir)/egg/libegg-buffer.a \
+	$(top_builddir)/egg/libegg-creds.a \
+	$(top_builddir)/egg/libegg-secure.a \
 	-lpam
 	
 pam_gnome_keyring_la_LDFLAGS = \
diff --git a/pkcs11/gck/tests/Makefile.am b/pkcs11/gck/tests/Makefile.am
index c0ed0df..d9175aa 100644
--- a/pkcs11/gck/tests/Makefile.am
+++ b/pkcs11/gck/tests/Makefile.am
@@ -22,7 +22,7 @@ UNIT_PROMPT =
 
 UNIT_LIBS =  \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg.la
+	$(top_builddir)/egg/libegg.a
 
 EXTRA_DIST = \
 	test.asn \
diff --git a/pkcs11/roots-store/Makefile.am b/pkcs11/roots-store/Makefile.am
index ae38af6..9e49343 100644
--- a/pkcs11/roots-store/Makefile.am
+++ b/pkcs11/roots-store/Makefile.am
@@ -37,8 +37,8 @@ gck_roots_store_standalone_la_SOURCES = \
 gck_roots_store_standalone_la_LIBADD = \
 	libgck-roots-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-secure.la \
+	$(top_builddir)/egg/libegg-buffer.a \
+	$(top_builddir)/egg/libegg-secure.a \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
diff --git a/pkcs11/roots-store/tests/Makefile.am b/pkcs11/roots-store/tests/Makefile.am
index d0952b3..5be5a67 100644
--- a/pkcs11/roots-store/tests/Makefile.am
+++ b/pkcs11/roots-store/tests/Makefile.am
@@ -3,5 +3,5 @@
 all:
 	
 p11-tests:
-	p11-tests -f p11-tests.conf ../.libs/gck-roots-module.so
+	p11-tests -f p11-tests.conf ../.libs/gck-roots-store-standalone.so
 	
\ No newline at end of file
diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
index 0f085f3..1f2c9e7 100644
--- a/pkcs11/rpc-layer/Makefile.am
+++ b/pkcs11/rpc-layer/Makefile.am
@@ -44,8 +44,8 @@ gnome_keyring_pkcs11_la_SOURCES = \
 	gck-rpc-util.c
 
 gnome_keyring_pkcs11_la_LIBADD = \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la 
+	$(top_builddir)/egg/libegg-buffer.a \
+	$(top_builddir)/egg/libegg-creds.a 
 
 gnome_keyring_pkcs11_la_LDFLAGS = \
 	-module -avoid-version \
diff --git a/pkcs11/ssh-agent/Makefile.am b/pkcs11/ssh-agent/Makefile.am
index 84b7332..c5200d6 100644
--- a/pkcs11/ssh-agent/Makefile.am
+++ b/pkcs11/ssh-agent/Makefile.am
@@ -31,8 +31,8 @@ gck_ssh_agent_standalone_SOURCES = \
 gck_ssh_agent_standalone_LDADD = \
 	libgck-ssh-agent.la \
 	$(top_builddir)/gp11/libgp11.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-secure.la \
+	$(top_builddir)/egg/libegg-buffer.a \
+	$(top_builddir)/egg/libegg-secure.a \
     	$(GOBJECT_LIBS) \
     	$(GTHREAD_LIBS) \
     	$(LIBGCRYPT_LIBS) \
diff --git a/pkcs11/ssh-store/Makefile.am b/pkcs11/ssh-store/Makefile.am
index 2ebd623..6e4e1d1 100644
--- a/pkcs11/ssh-store/Makefile.am
+++ b/pkcs11/ssh-store/Makefile.am
@@ -39,7 +39,7 @@ gck_ssh_store_standalone_la_SOURCES = \
 gck_ssh_store_standalone_la_LIBADD = \
 	libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg.la \
+	$(top_builddir)/egg/libegg.a \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \
diff --git a/pkcs11/ssh-store/tests/Makefile.am b/pkcs11/ssh-store/tests/Makefile.am
index e98645b..060dd89 100644
--- a/pkcs11/ssh-store/tests/Makefile.am
+++ b/pkcs11/ssh-store/tests/Makefile.am
@@ -6,7 +6,7 @@ UNIT_PROMPT =
 UNIT_LIBS =  \
 	$(top_builddir)/pkcs11/ssh-store/libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg.la
+	$(top_builddir)/egg/libegg.a
 
 include $(top_srcdir)/tests/gtest.make
 
diff --git a/tool/Makefile.am b/tool/Makefile.am
index 8dd5fcb..8a9b426 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -19,7 +19,7 @@ gnome_keyring_CFLAGS = \
 gnome_keyring_LDADD = \
 	$(top_builddir)/gp11/libgp11.la \
 	$(top_builddir)/gcr/libgcr.la \
-	$(top_builddir)/egg/libegg.la \
+	$(top_builddir)/egg/libegg.a \
 	$(GTK_LIBS) \
 	$(GCRYPT_LIBS) \
 	$(LIBTASN1_LIBS) \
