diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
index 2165fbd7..29ea226f 100644
--- a/SparkleShare/Makefile.am
+++ b/SparkleShare/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS =	\
+	Nautilus
+
 ASSEMBLY = SparkleShare
 TARGET = exe
 
diff --git a/SparkleShare/Nautilus/Makefile.am b/SparkleShare/Nautilus/Makefile.am
new file mode 100644
index 00000000..a821d5e6
--- /dev/null
+++ b/SparkleShare/Nautilus/Makefile.am
@@ -0,0 +1,10 @@
+SOURCES =  \
+	sparkleshare-nautilus-extension.py
+
+if NAUTILUS_EXTENSION_ENABLED
+NAUTILUS_PYTHON_INSTALL_DIR=$(subst $(NAUTILUS_LIBDIR),${libdir},$(NAUTILUS_PYTHON_DIR))
+extensiondir = $(NAUTILUS_PYTHON_INSTALL_DIR)
+extension_SCRIPTS = $(addprefix $(srcdir)/, $(SOURCES))
+else
+EXTRA_DIST = $(SOURCES)
+endif
diff --git a/build/m4/sparkleshare/nautilus-python.m4 b/build/m4/sparkleshare/nautilus-python.m4
new file mode 100644
index 00000000..d7765330
--- /dev/null
+++ b/build/m4/sparkleshare/nautilus-python.m4
@@ -0,0 +1,14 @@
+AC_DEFUN([SPARKLESHARE_NAUTILUS_PYTHON],
+[
+	PKG_CHECK_MODULES(NAUTILUS_PYTHON, nautilus-python, have_nautilus_python=yes, have_nautilus_python=no)
+	if test "x$have_nautilus_python" = "xyes"; then
+		NAUTILUS_LIBDIR="`$PKG_CONFIG --variable=libdir nautilus-python`"
+		AC_SUBST(NAUTILUS_LIBDIR)
+		NAUTILUS_PYTHON_DIR="`$PKG_CONFIG --variable=pythondir nautilus-python`"
+		AC_SUBST(NAUTILUS_PYTHON_DIR)
+		AM_CONDITIONAL(NAUTILUS_EXTENSION_ENABLED, true)
+	else
+		AM_CONDITIONAL(NAUTILUS_EXTENSION_ENABLED, false)
+	fi
+])
+
diff --git a/configure.ac b/configure.ac
index d3333527..0e8f8f31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,9 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
     Mono.Posix
 ])
 
+dnl Get nautilus extensions directory
+SPARKLESHARE_NAUTILUS_PYTHON
+
 SHAVE_INIT([build/m4/shave], [enable])
 
 
@@ -90,6 +93,7 @@ SparkleShare/sparkleshare
 SparkleShare/Defines.cs
 SparkleShare/AssemblyInfo.cs
 SparkleShare/Makefile
+SparkleShare/Nautilus/Makefile
 po/Makefile.in
 Makefile
 ])