diff --git a/debian/control b/debian/control
index fb7c369..ea71355 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Description: Library with common API for various MATE modules (common files)
  This package contains the architecture-independent files.
 
 Package: libmate-desktop-2-17
+Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -93,10 +94,13 @@ Depends: libdconf-dev,
          libgtk-3-dev,
          libmate-desktop-2-17 (= ${binary:Version}),
          libstartup-notification0-dev,
+         gir1.2-matedesktop-2.0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: libmatedesktop-dev,
+        gir1.2-mate-desktop (<< 1.18.0-2~),
 Replaces: libmatedesktop-dev,
+          gir1.2-mate-desktop (<< 1.18.0-2~),
 Description: Library with common API for various MATE modules (development files)
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.
@@ -124,14 +128,17 @@ Description: Library with common API for various MATE modules (documentation fil
  .
  This package contains the documentation files.
 
-Package: gir1.2-mate-desktop
+Package: gir1.2-matedesktop-2.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: libmate-desktop-2-17 (= ${binary:Version}),
          ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends},
-Description: GObject introspection data for the mate-desktop library
+Breaks: gir1.2-mate-desktop (<< 1.18.0-2~),
+Replaces: gir1.2-mate-desktop (<< 1.18.0-2~),
+Description: GObject introspection data for the libmate-desktop library
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.
  .
@@ -143,3 +150,12 @@ Description: GObject introspection data for the mate-desktop library
  .
  It can be used by packages using the GIRepository format to generate
  dynamic bindings.
+
+Package: gir1.2-mate-desktop
+Section: oldlibs
+Architecture: any
+Depends: ${misc:Depends},
+         gir1.2-matedesktop-2.0 (= ${binary:Version}),
+Description: GObject introspection data for libmate-desktop (transitional package)
+ This package is a transitional package to gir1.2-matedesktop-2.0. The package
+ can be safely removed.
diff --git a/debian/gir1.2-mate-desktop.install b/debian/gir1.2-matedesktop-2.0.install
similarity index 59%
rename from debian/gir1.2-mate-desktop.install
rename to debian/gir1.2-matedesktop-2.0.install
index a7d874f..9038727 100644
--- a/debian/gir1.2-mate-desktop.install
+++ b/debian/gir1.2-matedesktop-2.0.install
@@ -1,2 +1 @@
 usr/lib/*/girepository-1.0/
-usr/share/gir-1.0/
diff --git a/debian/libmate-desktop-dev.install b/debian/libmate-desktop-dev.install
index 5be5463..989686b 100644
--- a/debian/libmate-desktop-dev.install
+++ b/debian/libmate-desktop-dev.install
@@ -1,3 +1,4 @@
 usr/include/
 usr/lib/*/*.so
 usr/lib/*/pkgconfig/
+usr/share/gir-1.0/
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..6ead43c
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# ignore lintian about gir1.2-mate-desktop complaints, the package is a transitional package
+source: typelib-missing-gir-depends gir1.2-mate-desktop