diff --git a/ChangeLog b/ChangeLog
index cf198856a7..37637ed346 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 #342398:
+	* configure.in, gnome/Makefile.am, Makefile.am: Add "--without-gnome"
+	  configure flag to disable building of the GNOME-based applet.
+
 2006-05-25  Robert Love  <rml@novell.com>
 
 	* gnome/applet/nm-device.c, gnome/applet/nm-device.h: Rename function
diff --git a/Makefile.am b/Makefile.am
index 12b5da07f8..3e0401773f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,13 +15,19 @@ EXTRA_DIST =				\
 	NetworkManager.pc.in	\
 	intltool-extract.in		\
 	intltool-merge.in		\
-	intltool-update.in		\
+	intltool-update.in		
+	
+if WITH_GNOME
+EXTRA_DIST +=				\
 	nm-applet.desktop
+endif
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
+if WITH_GNOME
 autostartdir = $(datadir)/gnome/autostart
 autostart_DATA = nm-applet.desktop
+endif
diff --git a/configure.in b/configure.in
index a20dc5e272..13b1b616c4 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,12 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
+dnl
+dnl GNOME support
+dnl
+AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager without GNOME support, e.g. daemon only]))
+AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
+
 dnl
 dnl translation support
 dnl
@@ -145,33 +151,35 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0)
+	AC_SUBST(GTK_CFLAGS)
+	AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
+	AC_SUBST(GDK_PIXBUF_CFLAGS)
+	AC_SUBST(GDK_PIXBUF_LIBS)
 
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	AC_SUBST(GLADE_CFLAGS)
+	AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	AC_SUBST(GCONF_CFLAGS)
+	AC_SUBST(GCONF_LIBS)
 
-PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
-AC_SUBST(GNOME_KEYRING_CFLAGS)
-AC_SUBST(GNOME_KEYRING_LIBS)
+	PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
+	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])
+	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
-AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno)
+AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
 
 PKG_CHECK_MODULES(LIBNL, libnl-1)
 AC_SUBST(LIBNL_CFLAGS)
@@ -199,13 +207,15 @@ else
 fi
 AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno)
 
-PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
-AC_SUBST(PANEL_APPLET_CFLAGS)
-AC_SUBST(PANEL_APPLET_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
+	AC_SUBST(PANEL_APPLET_CFLAGS)
+	AC_SUBST(PANEL_APPLET_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before
-AC_SUBST(LIBGNOMEUI_LIBS)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before
+	AC_SUBST(LIBGNOMEUI_LIBS)
+fi
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index 285bd24848..1f6ce0833d 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -1,2 +1,6 @@
+if WITH_GNOME
 SUBDIRS = applet libnm_glib vpn-properties
+else
+SUBDIRS = libnm_glib
+endif