diff --git a/ChangeLog b/ChangeLog
index 0b336ec5ad..8bed1e5f98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-18  Robert Love  <rml@novell.com>
+
+	* configure.in: Add "--with-notify" option to allow disabling of
+	  libnotify support.
+
 2006-07-13  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Thiago Bauermann <thiago.bauermann@gmail.com>
diff --git a/configure.in b/configure.in
index ba35b0f508..681dc29629 100644
--- a/configure.in
+++ b/configure.in
@@ -151,6 +151,8 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
+AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto)
+
 if test x"$with_gnome" != xno; then
 	PKG_CHECK_MODULES(GTK, gtk+-2.0)
 	AC_SUBST(GTK_CFLAGS)
@@ -172,11 +174,13 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOME_KEYRING_CFLAGS)
 	AC_SUBST(GNOME_KEYRING_LIBS)
 
-	PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
-				[enable_notify=no])
-	if test "x$enable_notify" != "xno"; then
-		AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1],
-		[Enable notifications with libnotify])
+	if test x"$enable_notify" != xno; then
+		PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
+					[enable_notify=no])
+		if test "x$enable_notify" != "xno"; then
+			AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1],
+			[Enable notifications with libnotify])
+		fi
 	fi
 fi
 AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'