diff --git a/ChangeLog b/ChangeLog
index b72cf51a5..67d5cf62b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-01  Rodrigo Moya <rodrigo@novell.com>
+
+	* Makefile.am: use the correct dir for autostart mechanism.
+
 2006-02-28  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Brian Magnuson <magnuson@rcn.com>
diff --git a/Makefile.am b/Makefile.am
index 455784707..12b5da07f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,5 +23,5 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
-autostartdir = $(datadir)/autostart
+autostartdir = $(datadir)/gnome/autostart
 autostart_DATA = nm-applet.desktop