diff --git a/configure.ac b/configure.ac
index da307d8..7364781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,11 +71,6 @@ AC_DEFUN([XEDIT_FULLPATH], [
   $3=`eval echo [$]ac_expand`
 ])
 
-dnl FULL_LIBEXECDIR is used for X-MATE-Bugzilla-ExtraInfoScript expansion
-dnl in data/xedit.desktop.in.in
-XEDIT_FULLPATH(libexecdir, NONE, FULL_LIBEXECDIR)
-AC_SUBST(FULL_LIBEXECDIR)
-
 dnl ================================================================
 dnl Gettext stuff.
 dnl ================================================================
@@ -413,32 +408,3 @@ Configuration:
 	Gvfs metadata enabled:	$enable_gvfs_metadata
 	Tests enabled:		$enable_tests
 "
-
-if expr ${XEDIT_MINOR_VERSION} % 2 > /dev/null; then
-	stable_version=`expr ${XEDIT_MINOR_VERSION} - 1`
-
-cat << EOF
- *** IMPORTANT ***
-
-This is an unstable version of xedit.
-It is for test purposes only.
-
-Please, DO NOT use it in a production environment.
-It will probably crash and you will lose your data.
-
-If you are looking for a stable release of xedit, either download
-it from:
-
-  http://pub.mate-desktop.org/release/1.${stable_version}/
-
-Or checkout the 1.${stable_version} branch of the xedit module from:
-
-  git://github.com/mate-desktop/xedit.git
-
-Thanks,
-The xedit team
-
- *** END OF WARNING ***
-EOF
-
-fi
diff --git a/data/xedit.desktop.in.in b/data/xedit.desktop.in.in
index 3915dbc..347b2c7 100644
--- a/data/xedit.desktop.in.in
+++ b/data/xedit.desktop.in.in
@@ -12,8 +12,3 @@ Categories=GTK;Utility;TextEditor;
 Keywords=text;editor;MATE;tabs;highlighting;code;multiple;files;pluggable;
 X-MATE-DocPath=xedit/xedit.xml
 _X-MATE-FullName=Xedit Text Editor
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=Xedit
-X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/xedit/xedit-bugreport.sh
diff --git a/debian/control b/debian/control
index af3244a..eb38245 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,10 @@ Build-Depends: autotools-dev,
                libglib2.0-dev,
                libgtk-3-dev,
                libgtksourceview-3.0-dev,
-               libmate-desktop-dev (>= 1.12),
                libsm-dev,
                libx11-dev,
                libxml2-dev,
-               mate-common (>= 1.12),
+               mate-common,
                yelp-tools,
 Standards-Version: 3.9.6
 Homepage: http://www.mate-desktop.org/
@@ -27,15 +26,11 @@ Homepage: http://www.mate-desktop.org/
 Package: xedit
 Architecture: any
 Depends: iso-codes,
-         mate-desktop-common,
          xedit-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
 Recommends: zenity,
-Provides: mate-text-editor,
-Breaks: mate-text-editor (<< 1.5.0),
-Replaces: mate-text-editor (<< 1.5.0),
 XB-Python-Version: ${python:Versions}
 Description: official text editor of the MATE desktop environment
  Xedit is a text editor which supports most standard editor features,
diff --git a/debian/rules b/debian/rules
index 23be790..04ab290 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ DHFLAGS=--parallel
 	dh $@ $(DHFLAGS)
 
 override_dh_install:
-	rm -f debian/tmp/usr/share/MateConf/gsettings/*.convert
 	rm -rfv debian/tmp/usr/lib/*/xedit/plugin-loaders/*.la
 	rm -rfv debian/tmp/usr/lib/*/xedit/plugins/*.la
 	dh_install --fail-missing