diff --git a/ChangeLog b/ChangeLog
index 3ed77bcd3..21a8b3b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Damien Carberry <damien.carberry@sun.com>
+
+	* configure.in: determine correct nautilus extension dir via
+	pkgconfig (#505364)
+
 2008-01-16  Rodrigo Moya <rodrigo@gnome-db.org>
 
 	* Makefile.am:
diff --git a/configure.in b/configure.in
index 4da474394..8023cd57f 100644
--- a/configure.in
+++ b/configure.in
@@ -258,6 +258,10 @@ if test x$enable_vfs_methods = xyes; then
   FONTILUS=fontilus
   AC_SUBST(THEMUS)
   AC_SUBST(FONTILUS)
+  # Determine the install dir for the nautilus extensions.
+  NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+  AC_SUBST(NAUTILUSDIR)
+
 
   # update LIBS for $export_dynamic
   export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog
index 26e705c78..6f28b0cc6 100644
--- a/vfs-methods/fontilus/ChangeLog
+++ b/vfs-methods/fontilus/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Damien Carberry <damien.carberry@sun.com>
+
+	* Makefile.am: determine correct nautilus extension dir via
+	pkgconfig (#505364)
+
 2007-12-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* Makefile.am: Install the nautilus extension in the right spot.
diff --git a/vfs-methods/fontilus/Makefile.am b/vfs-methods/fontilus/Makefile.am
index 0f21e205b..188e461c6 100644
--- a/vfs-methods/fontilus/Makefile.am
+++ b/vfs-methods/fontilus/Makefile.am
@@ -19,7 +19,7 @@ gnome_thumbnail_font_SOURCES = ftstream-vfs.c thumbnailer.c
 gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
 gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
-nautilusdir = $(libdir)/nautilus/extensions-2.0
+nautilusdir = $(NAUTILUSDIR)
 nautilus_LTLIBRARIES = libnautilus-fontilus.la
 libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'nautilus_module_.*'
diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog
index ceaab7cf0..a3334fa24 100644
--- a/vfs-methods/themus/ChangeLog
+++ b/vfs-methods/themus/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Damien Carberry <damien.carberry@sun.com>
+
+	* Makefile.am: determine correct nautilus extension dir via
+	pkgconfig (#505364)
+
 2007-12-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* Makefile.am: Install the nautilus extension in the right spot.
diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am
index 8519c6ef6..47474882b 100644
--- a/vfs-methods/themus/Makefile.am
+++ b/vfs-methods/themus/Makefile.am
@@ -13,7 +13,7 @@ bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier
 vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
 vfsmodule_LTLIBRARIES = libtheme-method.la
 
-nautilusdir = $(libdir)/nautilus/extensions-2.0
+nautilusdir = $(NAUTILUSDIR)
 nautilus_LTLIBRARIES = libnautilus-themus.la
 
 libtheme_method_la_LDFLAGS = -module -avoid-version -no-undefined \