diff --git a/debian/changelog b/debian/changelog
index 963f56d..57d4c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-media (1.8.0-1) UNRELEASED; urgency=low
+mate-media (1.8.0+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734802).
 
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
new file mode 100644
index 0000000..fb4543d
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,32 @@
+Description: Don't build non-DFSG (GFDL 1.1 licensed) help files
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,10 +357,8 @@
+ gst-mixer/icons/16x16/status/Makefile
+ gst-mixer/src/Makefile
+ gst-mixer/pixmaps/Makefile
+-gst-mixer/doc/Makefile
+ gst-mixer/mate-volume-control.desktop.in
+ gst-mixer-applet/Makefile
+-gst-mixer-applet/docs/Makefile
+ ])
+ 
+ AC_OUTPUT
+--- a/gst-mixer-applet/Makefile.am
++++ b/gst-mixer-applet/Makefile.am
+@@ -1,5 +1,3 @@
+-SUBDIRS = docs
+-
+ AM_CPPFLAGS = -I. -I$(srcdir) 			\
+ 	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+ 	-DMIXER_MENU_UI_DIR=\""$(uidir)"\"	\
+--- a/gst-mixer/Makefile.am
++++ b/gst-mixer/Makefile.am
+@@ -1,5 +1,5 @@
+ Desktopdir = $(datadir)/applications
+-SUBDIRS = doc icons pixmaps src
++SUBDIRS = icons pixmaps src
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ Desktop_in_files = mate-volume-control.desktop.in.in
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..83b110e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_omit-gfdl-licensed-help-files.patch
diff --git a/debian/rules b/debian/rules
index 432561c..5968e81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
+PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+DTYPE = +dfsg1
+VER  ?= $(subst $(DTYPE),,$(UVER))
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -50,5 +56,24 @@ install/mate-media-pulse::
 	# delete conflicts file with mate-media-common
 	rm -rf debian/mate-media-pulse/usr/share/locale/
 
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=..
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+	@
+
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+	@echo "# Downloading..."
+	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
+	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
+	@echo "# Extracting..."
+	mkdir $(PKG)-$(VER) \
+	    && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
+	    || $(RM) -r $(PKG)-$(VER)
+	@echo "# Cleaning-up..."
+	cd $(PKG)-$(VER) \
+	    && $(RM) -r -v \
+	        */doc/ \
+	        */docs/
+	$(RM) -v $(PKG)_$(VER).orig.tar.*
+	@echo "# Packing..."
+	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+	    | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+	    && $(RM) -r "$(PKG)-$(VER)"
diff --git a/debian/watch b/debian/watch
index 84a30af..d8bfbeb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
+opts=dversionmangle=s/\+dfsg1// \
 http://git.mate-desktop.org/mate-media/ \
     snapshot/mate-media-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz