diff --git a/legacy/emotion/debian/control b/legacy/emotion/debian/control
index 8d16e97170..7ae5cfa3ae 100644
--- a/legacy/emotion/debian/control
+++ b/legacy/emotion/debian/control
@@ -1,6 +1,6 @@
 Source: emotion
 Priority: optional
-Maintainer: Sytse Wielinga <s.b.wielinga@student.utwente.nl>
+Maintainer: E17 Debian Team <debian@edevelop.org>
 Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.9 | automaken, libtool, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer0.10-ffmpeg, gstreamer0.10-plugins-good, gstreamer0.10-tools
 Standards-Version: 3.6.2.2
 
@@ -12,6 +12,8 @@ Provides: libemotion
 Description: Video playback library used in Enlightenment DR0.17
  This is the emotion library, a wrapper library used in the next-generation
  Enlightenment suite for video playback.
+ .
+ This package contains the shared libraries.
 
 Package: libemotion0-dev
 Section: libdevel
@@ -21,6 +23,9 @@ Provides: libemotion-dev
 Description: Headers, static libraries and documentation for Emotion
  This package contains development files for the Emotion library, a wrapper
  library used in the next-generation Enlightenment suite for video playback.
+ .
+ This package contains headers and static libraries for development with
+ libemotion.
 
 Package: libemotion0-xine
 Section: libs
@@ -50,4 +55,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Provides: emotion-bin
 Description: Test programs for Emotion
+ This is the emotion library, a wrapper library used in the next-generation
+ Enlightenment suite for video playback.
+ . 
  This package contains test programs for the Emotion library.
diff --git a/legacy/emotion/debian/libemotion0-dev.install b/legacy/emotion/debian/libemotion0-dev.install
index fd60aa4271..3efa15f7a2 100644
--- a/legacy/emotion/debian/libemotion0-dev.install
+++ b/legacy/emotion/debian/libemotion0-dev.install
@@ -2,6 +2,7 @@ debian/tmp/usr/include/*
 debian/tmp/usr/lib/lib*.a
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.so
 debian/tmp/usr/bin/emotion-config
 debian/tmp/usr/lib/emotion/*.a
 debian/tmp/usr/lib/emotion/*.la
diff --git a/legacy/emotion/debian/libemotion0.install b/legacy/emotion/debian/libemotion0.install
index 9e44658028..7945678fef 100644
--- a/legacy/emotion/debian/libemotion0.install
+++ b/legacy/emotion/debian/libemotion0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libemotion.so*
+debian/tmp/usr/lib/libemotion.so.*
diff --git a/legacy/emotion/debian/rules b/legacy/emotion/debian/rules
index cc66a7e642..2ae22e66b2 100644
--- a/legacy/emotion/debian/rules
+++ b/legacy/emotion/debian/rules
@@ -1,94 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Rewrote debian/rules to use cdbs.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_MAKE_CLEAN_TARGET := clean
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
-
-CFLAGS ?= -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-INSTALL=/usr/bin/install -p
-CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS)
-
-	touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	-mv debian/changelog debian/changelog.saved
-	-$(MAKE) distclean
-	-mv debian/changelog.saved debian/changelog
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_movefiles
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+clean::
+	if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi
+