diff --git a/legacy/emotion/debian/changelog.in b/legacy/emotion/debian/changelog.in
index b44d4245c9..5569e2ae96 100644
--- a/legacy/emotion/debian/changelog.in
+++ b/legacy/emotion/debian/changelog.in
@@ -2,5 +2,5 @@ emotion (@VERSION@-1) unstable; urgency=low
 
   * CVS Release.
 
- -- E17 Debian Team <debian@edevelop.org>  Sun,  8 Aug 2004 12:16:33 +0200
+ -- Falko Schmidt <falko@alphagemini.org>  Thu, 01 Apr 2008 15:11:22 +0000
 
diff --git a/legacy/emotion/debian/control b/legacy/emotion/debian/control
index 5f62b1105a..ed7a58977b 100644
--- a/legacy/emotion/debian/control
+++ b/legacy/emotion/debian/control
@@ -1,8 +1,10 @@
 Source: emotion
 Priority: optional
-Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: cdbs, debhelper (>= 5), pkg-config, libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.7.2
+Section: libs
+Maintainer: Falko Schmidt <falko@alphagemini.org>
+Build-Depends: cdbs, debhelper (>= 6), pkg-config, libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+Standards-Version: 3.7.3
+Homepage: http://www.enlightenment.org
 
 Package: libemotion0
 Section: libs
@@ -15,11 +17,11 @@ Description: Video playback library used in Enlightenment DR0.17
  .
  This package contains the shared libraries.
 
-Package: libemotion0-dev
+Package: libemotion-dev
 Section: libdevel
 Architecture: any
 Depends: libemotion0 (= ${Source-Version}), libevas-dev, libecore-dev
-Provides: libemotion-dev
+Provides: libemotion0-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.
@@ -27,7 +29,7 @@ Description: Headers, static libraries and documentation for Emotion
  This package contains headers and static libraries for development with
  libemotion.
 
-Package: libemotion0-xine
+Package: libemotion-xine
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libemotion0, libxine1 (>=1.1.0)
@@ -38,10 +40,10 @@ Description: Video playback library used in Enlightenment DR0.17
  .
  This package provides the xine module for emotion.
 
-Package: libemotion0-gstreamer
+Package: libemotion-gstreamer
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libemotion0, gstreamer0.10-plugins-good, gstreamer0.10-ffmpeg
+Depends: ${shlibs:Depends}, libemotion0, gstreamer0.10-plugins-good
 Provides: libemotion-gstreamer
 Description: Video playback library used in Enlightenment DR0.17
  This is the emotion library, a wrapper library used in the next-generation
@@ -49,11 +51,11 @@ Description: Video playback library used in Enlightenment DR0.17
  . 
  This package provides the gstreamer module for emotion.
 
-Package: emotion0-bin
+Package: libemotion-bin
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: emotion-bin
+Provides: libemotion0-bin
 Description: Test programs for Emotion
  This is the emotion library, a wrapper library used in the next-generation
  Enlightenment suite for video playback.
diff --git a/legacy/emotion/debian/emotion0-bin.install b/legacy/emotion/debian/libemotion-bin.install
similarity index 100%
rename from legacy/emotion/debian/emotion0-bin.install
rename to legacy/emotion/debian/libemotion-bin.install
diff --git a/legacy/emotion/debian/libemotion0-dev.install b/legacy/emotion/debian/libemotion-dev.install
similarity index 54%
rename from legacy/emotion/debian/libemotion0-dev.install
rename to legacy/emotion/debian/libemotion-dev.install
index d0ea761f74..b8d218ef39 100644
--- a/legacy/emotion/debian/libemotion0-dev.install
+++ b/legacy/emotion/debian/libemotion-dev.install
@@ -1,7 +1,4 @@
 debian/tmp/usr/include/*
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.la
 debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/emotion/*.a
-debian/tmp/usr/lib/emotion/*.la
diff --git a/legacy/emotion/debian/libemotion0-gstreamer.install b/legacy/emotion/debian/libemotion-gstreamer.install
similarity index 100%
rename from legacy/emotion/debian/libemotion0-gstreamer.install
rename to legacy/emotion/debian/libemotion-gstreamer.install
diff --git a/legacy/emotion/debian/libemotion0-xine.install b/legacy/emotion/debian/libemotion-xine.install
similarity index 100%
rename from legacy/emotion/debian/libemotion0-xine.install
rename to legacy/emotion/debian/libemotion-xine.install
diff --git a/legacy/emotion/debian/rules b/legacy/emotion/debian/rules
index 27b3079d9f..378c8aa60e 100644
--- a/legacy/emotion/debian/rules
+++ b/legacy/emotion/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_MAKE_CLEAN_TARGET := clean
+
 clean::
-	./autogen.sh --prefix=/usr
-	
+	./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)