diff --git a/ChangeLog b/ChangeLog
index 37637ed346..d6d9896c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-25  Robert Love  <rml@novell.com>
+
+	Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342400:
+	* libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are
+	  not using gcrypt.  Otherwise, we get a linker error.
+
 2006-05-25  Robert Love  <rml@novell.com>
 
 	Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342398:
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index b67245d459..8dc994034d 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -29,8 +29,6 @@ libnm_util_la_SOURCES=			\
 	cipher-wpa-psk-hex.h		\
 	cipher-wpa-psk-passphrase.c	\
 	cipher-wpa-psk-passphrase.h	\
-	gnome-keyring-md5.c			\
-	gnome-keyring-md5.h			\
 	dbus-helpers.c				\
 	dbus-helpers.h				\
 	sha1.c					\