diff -upr pluma/configure.ac pluma-test/configure.ac
--- pluma/configure.ac	2015-11-18 13:01:06.568533069 +0100
+++ pluma-test/configure.ac	2015-11-18 13:36:54.291063147 +0100
@@ -182,7 +182,6 @@ PKG_CHECK_MODULES(PLUMA, [
 	gio-2.0 >= 2.26.0
 	gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
 	gtksourceview-$GTK_API_VERSION >= 2.9.7
-	mate-desktop-2.0 >= 1.9.0
 ])
 
 PKG_CHECK_MODULES(X11, [x11])
@@ -199,6 +198,25 @@ AC_SUBST(EGG_SMCLIENT_CFLAGS)
 AC_SUBST(EGG_SMCLIENT_LIBS)
 
 dnl ================================================================
+dnl Mate-desktop support
+dnl ================================================================
+
+MATEDESKTOP_REQUIRED=1.9.0
+
+AC_ARG_WITH(matedesktop,
+        [AS_HELP_STRING([--without-matedesktop],
+                        [Disable the use of matedesktop])],
+        [],
+        [with_matedesktop=yes])
+
+AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"])
+
+if test "$with_matedesktop" = "yes"; then
+        PKG_CHECK_MODULES([SHELL_CORE], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED)
+        AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled])
+fi
+
+dnl ================================================================
 dnl GSettings related settings
 dnl ================================================================
 
@@ -420,6 +438,7 @@ Configuration:
 	Source code location:	${srcdir}
 	Compiler:		${CC}
 	GTK API version:	$GTK_API_VERSION
+	MATE desktop Support:   $with_matedesktop
 	Python Plugins Support: $enable_python
 	Spell Plugin enabled:	$enable_enchant
 	Gvfs metadata enabled:	$enable_gvfs_metadata
diff -upr pluma/pluma/pluma-commands-help.c pluma-test/pluma/pluma-commands-help.c
--- pluma/pluma/pluma-commands-help.c	2015-11-18 13:01:07.417541605 +0100
+++ pluma-test/pluma/pluma-commands-help.c	2015-11-18 13:18:49.474206961 +0100
@@ -37,7 +37,9 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#ifdef WITH_MATEDESKTOP
 #include <libmate-desktop/mate-aboutdialog.h>
+#endif
 
 #include "pluma-commands.h"
 #include "pluma-debug.h"
@@ -85,8 +87,13 @@ void _pluma_cmd_help_about(GtkAction* ac
 
 	pluma_debug (DEBUG_COMMANDS);
 
+#ifdef WITH_MATEDESKTOP
 	mate_show_about_dialog(GTK_WINDOW(window),
+#else
+	gtk_show_about_dialog(GTK_WINDOW(window),
+#endif
 		"program-name", "Pluma",
+
 		"authors", authors,
 		"comments", _(comments),
 		"copyright", copyright,