diff --git a/legacy/emotion/debian/control b/legacy/emotion/debian/control
index add6cab617..8d16e97170 100644
--- a/legacy/emotion/debian/control
+++ b/legacy/emotion/debian/control
@@ -1,8 +1,8 @@
 Source: emotion
 Priority: optional
 Maintainer: Sytse Wielinga <s.b.wielinga@student.utwente.nl>
-Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.7 | automaken, libtool, libgstreamer0.8-dev
-Standards-Version: 3.6.1.0
+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
 
 Package: libemotion0
 Section: libs
@@ -22,6 +22,28 @@ 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.
 
+Package: libemotion0-xine
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libemotion0, libxine1 (>=1.1.0)
+Provides: libemotion-xine
+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 provides the xine module for emotion.
+
+Package: libemotion0-gstreamer
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libemotion0, gstreamer0.10-plugins-good, gstreamer0.10-ffmpeg
+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
+ Enlightenment suite for video playback.
+ . 
+ This package provides the gstreamer module for emotion.
+
 Package: emotion0-bin
 Section: x11
 Architecture: any
diff --git a/legacy/emotion/debian/emotion0-bin.files b/legacy/emotion/debian/emotion0-bin.files
deleted file mode 100644
index 207ff48644..0000000000
--- a/legacy/emotion/debian/emotion0-bin.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/emotion_*
-usr/share/emotion/data/theme.edj
diff --git a/legacy/emotion/debian/emotion0-bin.install b/legacy/emotion/debian/emotion0-bin.install
new file mode 100644
index 0000000000..773df8d683
--- /dev/null
+++ b/legacy/emotion/debian/emotion0-bin.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/emotion_*
+debian/tmp/usr/share/emotion/data/theme.edj
diff --git a/legacy/emotion/debian/libemotion0-dev.files b/legacy/emotion/debian/libemotion0-dev.files
deleted file mode 100644
index b87e0fe48e..0000000000
--- a/legacy/emotion/debian/libemotion0-dev.files
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/bin/emotion-config
-usr/lib/emotion/*.a
-usr/lib/emotion/*.la
-usr/lib/xine/plugins/1.0.0/*.a
-usr/lib/xine/plugins/1.0.0/*.la
diff --git a/legacy/emotion/debian/libemotion0-dev.install b/legacy/emotion/debian/libemotion0-dev.install
new file mode 100644
index 0000000000..fd60aa4271
--- /dev/null
+++ b/legacy/emotion/debian/libemotion0-dev.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*.la
+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-gstreamer.install b/legacy/emotion/debian/libemotion0-gstreamer.install
new file mode 100644
index 0000000000..84948250e6
--- /dev/null
+++ b/legacy/emotion/debian/libemotion0-gstreamer.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/emotion/*gstreamer*.so
diff --git a/legacy/emotion/debian/libemotion0-xine.install b/legacy/emotion/debian/libemotion0-xine.install
new file mode 100644
index 0000000000..d801fe96bb
--- /dev/null
+++ b/legacy/emotion/debian/libemotion0-xine.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/emotion/*xine*.so
diff --git a/legacy/emotion/debian/libemotion0.files b/legacy/emotion/debian/libemotion0.files
deleted file mode 100644
index 714007a303..0000000000
--- a/legacy/emotion/debian/libemotion0.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/lib*.so.*
-usr/lib/emotion/*.so
-usr/lib/xine/plugins/1.0.0/*.so
diff --git a/legacy/emotion/debian/libemotion0.install b/legacy/emotion/debian/libemotion0.install
new file mode 100644
index 0000000000..9e44658028
--- /dev/null
+++ b/legacy/emotion/debian/libemotion0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libemotion.so*