diff --git a/debian/changelog b/debian/changelog
index 7db4ac4..71ce215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+muffin (2.6.1-3) UNRELEASED; urgency=medium
+
+  [ Fabio Fantoni ]
+  * Added muffin-doc package.
+
+ -- Margarita Manterola <marga@debian.org>  Tue, 09 Jun 2015 19:43:10 +0200
+
 muffin (2.6.1-2) unstable; urgency=critical
 
   [ Maximiliano Curia ]
diff --git a/debian/control b/debian/control
index f38e20b..581e40f 100644
--- a/debian/control
+++ b/debian/control
@@ -157,3 +157,17 @@ Description: lightweight window and compositing manager (debugging symbols)
  manager.
  .
  This package contains the debugging symbols.
+
+Package: muffin-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: lightweight window and compositing manager (Documentation)
+ Muffin is a small window manager performing compositing as well based on
+ GTK+ and Clutter and used in desktop environment such as Cinnamon.
+ .
+ It is fairly extensible by the mean of plugins, providing new or customized
+ visual effects as well as a flexibility in the behavior of the window
+ manager.
+ .
+ This package contains the documentation files distributed with Cinnamon.
diff --git a/debian/muffin-doc.install b/debian/muffin-doc.install
new file mode 100644
index 0000000..59a1ed2
--- /dev/null
+++ b/debian/muffin-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/muffin
diff --git a/debian/not-installed b/debian/not-installed
index a0c88ea..bda61cd 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -6,5 +6,3 @@ usr/lib/*/muffin/*.gir
 usr/lib/*/muffin/Meta-Muffin.0.typelib
 # manpages are compressed
 usr/share/man/man1/*.1
-# exclude dev docs
-usr/share/gtk-doc/html/muffin
diff --git a/debian/rules b/debian/rules
index 6d525ba..c8c0f21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_strip:
 	dh_strip --dbg-package=muffin-dbg
 
 override_dh_install:
-	dh_install -X.la -Xusr/share/gtk-doc/html/muffin --fail-missing
+	dh_install -X.la --fail-missing
 
 run_dh_acc:
 	# The package needs to be installed (@ in autopkgtest)