diff --git a/SparkleShare/Nautilus/Makefile.am b/SparkleShare/Nautilus/Makefile.am
index 68b8772d..8240d060 100755
--- a/SparkleShare/Nautilus/Makefile.am
+++ b/SparkleShare/Nautilus/Makefile.am
@@ -1,10 +1,15 @@
 SOURCES =  \
-	sparkleshare-nautilus-extension.py
+	sparkleshare-nautilus-extension.py \
+	sparkleshare-nautilus3-extension.py
 
-if NAUTILUS_EXTENSION_ENABLED
+if NAUTILUS2_EXTENSION_ENABLED
 NAUTILUS_PYTHON_INSTALL_DIR=$(subst $(NAUTILUS_PREFIX)/,${prefix}/,$(NAUTILUS_PYTHON_DIR))
 extensiondir = $(NAUTILUS_PYTHON_INSTALL_DIR)
-extension_SCRIPTS = $(addprefix $(srcdir)/, $(SOURCES))
-else
-EXTRA_DIST = $(SOURCES) sparkleshare-nautilus-extension.py.in
+extension_SCRIPTS = $(addprefix $(srcdir)/, sparkleshare-nautilus-extension.py))
 endif
+if NAUTILUS3_EXTENSION_ENABLED
+NAUTILUS_PYTHON_INSTALL_DIR=$(subst $(NAUTILUS_PREFIX)/,${prefix}/,$(NAUTILUS_PYTHON_DIR))
+extensiondir = $(NAUTILUS_PYTHON_INSTALL_DIR)
+extension_SCRIPTS = $(addprefix $(srcdir)/, sparkleshare-nautilus3-extension.py)
+endif
+EXTRA_DIST = $(SOURCES) sparkleshare-nautilus-extension.py.in sparkleshare-nautilus3-extension.py.in
diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
similarity index 99%
rename from SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
rename to SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
index e3abdd44..4d2164fa 100755
--- a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
+++ b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
@@ -25,7 +25,7 @@ from gi.repository import Nautilus, GObject, Gtk, Gdk
 SPARKLESHARE_PATH = os.path.join (os.path.expanduser ('~'), "SparkleShare")
 
 import gettext
-gettext.bindtextdomain('sparkleshare', '/usr/share/locale')
+gettext.bindtextdomain('sparkleshare', '@prefix@/share/locale')
 gettext.textdomain('sparkleshare')
 _ = gettext.gettext
 
diff --git a/build/m4/sparkleshare/nautilus-python.m4 b/build/m4/sparkleshare/nautilus-python.m4
index 1256f362..cec0a72e 100755
--- a/build/m4/sparkleshare/nautilus-python.m4
+++ b/build/m4/sparkleshare/nautilus-python.m4
@@ -1,14 +1,34 @@
 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_PREFIX="`$PKG_CONFIG --variable=prefix nautilus-python`"
-		AC_SUBST(NAUTILUS_PREFIX)
-		NAUTILUS_PYTHON_DIR="`$PKG_CONFIG --variable=pythondir nautilus-python`"
-		AC_SUBST(NAUTILUS_PYTHON_DIR)
-		AM_CONDITIONAL(NAUTILUS_EXTENSION_ENABLED, true)
+        AC_ARG_ENABLE(nautilus-extension,
+           AC_HELP_STRING([--disable-nautilus-extension],[Do not install the Nautilus plugin]), enable_nautilus_extension=$enableval, enable_nautilus_extension=yes )
+        if test x$enable_nautilus_extension = xyes; then
+		PKG_CHECK_MODULES(NAUTILUS_PYTHON, nautilus-python < 1.1, have_nautilus2_python=yes, have_nautilus2_python=no)
+		if test "x$have_nautilus2_python" = "xyes"; then
+			NAUTILUS_PREFIX="`$PKG_CONFIG --variable=prefix nautilus-python`"
+			AC_SUBST(NAUTILUS_PREFIX)
+			NAUTILUS_PYTHON_DIR="`$PKG_CONFIG --variable=pythondir nautilus-python`"
+			AC_SUBST(NAUTILUS_PYTHON_DIR)
+			AM_CONDITIONAL(NAUTILUS2_EXTENSION_ENABLED, true)
+		else
+			AM_CONDITIONAL(NAUTILUS2_EXTENSION_ENABLED, false)
+		fi
+		PKG_CHECK_MODULES(NAUTILUS3_PYTHON, nautilus-python >= 1.1, have_nautilus3_python=yes, have_nautilus3_python=no)
+		if test "x$have_nautilus3_python" = "xyes"; then
+			NAUTILUS_PREFIX="`$PKG_CONFIG --variable=prefix nautilus-python`"
+			AC_SUBST(NAUTILUS_PREFIX)
+			NAUTILUS_PYTHON_DIR="`$PKG_CONFIG --variable=pythondir nautilus-python`"
+			AC_SUBST(NAUTILUS_PYTHON_DIR)
+			AM_CONDITIONAL(NAUTILUS3_EXTENSION_ENABLED, true)
+		else
+			AM_CONDITIONAL(NAUTILUS3_EXTENSION_ENABLED, false)
+		fi
 	else
-		AM_CONDITIONAL(NAUTILUS_EXTENSION_ENABLED, false)
+		have_nautilus2_python="disabled"
+		have_nautilus3_python="disabled"
 	fi
+
+	AM_CONDITIONAL(NAUTILUS2_EXTENSION_ENABLED, test "x$enable_nautilus_extension" = "xyes")
+	AM_CONDITIONAL(NAUTILUS3_EXTENSION_ENABLED, test "x$enable_nautilus_extension" = "xyes")
 ])
 
diff --git a/configure.ac b/configure.ac
index de87cc4a..2116eb11 100755
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ SparkleShare/Makefile
 SparkleShare/Mac/Makefile
 SparkleShare/Nautilus/Makefile
 SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
+SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py
 po/Makefile.in
 Makefile
 ])
@@ -185,7 +186,8 @@ SparkleShare ${VERSION}
 Configuration:
        Prefix              : ${prefix}
        Build Gtk+ UI       : ${enable_gtkui}
-       Nautilus plugin     : ${have_nautilus_python}
+       Nautilus 2.x plugin : ${have_nautilus2_python}
+       Nautilus 3.x plugin : ${have_nautilus3_python}
        User Help           : ${enable_user_help} (requires gnome-doc-utils >= 0.17.3)
 
 "
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 02cf6655..fbf8c10f 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,6 +10,7 @@ data/plugins/own-server.xml.in
 SparkleShare/Mac/SparkleStatusIcon.cs
 SparkleShare/Mac/SparkleUI.cs
 SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
+SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
 SparkleShare/Program.cs
 SparkleShare/SparkleAbout.cs
 SparkleShare/SparkleController.cs