diff -Nru mplayer2-2.0-554-gf63dbad/debian/changelog mplayer2-2.0-554-gf63dbad/debian/changelog
--- mplayer2-2.0-554-gf63dbad/debian/changelog	2012-05-19 18:07:30.000000000 +0000
+++ mplayer2-2.0-554-gf63dbad/debian/changelog	2012-12-10 19:39:24.000000000 +0000
@@ -1,3 +1,11 @@
+mplayer2 (2.0-554-gf63dbad-1ubuntu1) raring; urgency=low
+
+  * Enable CPU autodetection on architectures that support it,
+    Closes: #627197,
+    LP: #934774, #928793, #858226, #974125, #974774, #987734, #1014279
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Mon, 10 Dec 2012 20:35:19 +0100
+
 mplayer2 (2.0-554-gf63dbad-1) unstable; urgency=low
 
   * New upstream snapshot:
diff -Nru mplayer2-2.0-554-gf63dbad/debian/control mplayer2-2.0-554-gf63dbad/debian/control
--- mplayer2-2.0-554-gf63dbad/debian/control	2012-05-19 18:06:35.000000000 +0000
+++ mplayer2-2.0-554-gf63dbad/debian/control	2012-11-21 20:28:42.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mplayer2
 Section: video
 Priority: extra
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders:
  Reinhard Tartler <siretart@tauware.de>,
  Alessio Treglia <alessio@debian.org>
diff -Nru mplayer2-2.0-554-gf63dbad/debian/rules mplayer2-2.0-554-gf63dbad/debian/rules
--- mplayer2-2.0-554-gf63dbad/debian/rules	2012-05-19 18:06:35.000000000 +0000
+++ mplayer2-2.0-554-gf63dbad/debian/rules	2012-10-28 21:55:37.000000000 +0000
@@ -12,6 +12,11 @@
 endif
 endif
 
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(DEB_HOST_GNU_CPU),i686)
+	CFLAGS += -march=i686
+endif
+
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += `dpkg-buildflags --get CPPFLAGS`
 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
@@ -22,21 +27,26 @@
 	--disable-svga \
 	--extra-cflags="${CFLAGS}" \
 	--extra-ldflags="${LDFLAGS}" \
-	--enable-debug=3
+	--enable-debug=3 \
+	$(archconf)
 
-# runtime cpu detection works on x86 and ppc only. These checks also work on kfreebsd!
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq ($(DEB_HOST_GNU_CPU),i486)
-	confflags += --enable-runtime-cpudetection
+ifeq ($(DEB_HOST_ARCH),i386)
+#configure optimizes for the cpu detected at ./configure time
+#in order to build a generic binary, avoid non-standard opcodes through gcc
+  archconf += --target=i586-linux
+  confflags += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),amd64)
+  confflags += --enable-runtime-cpudetection
 endif
-ifeq ($(DEB_HOST_GNU_CPU),x86_64)
-	confflags += --enable-runtime-cpudetection
+ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
+  confflags += --enable-runtime-cpudetection
 endif
-ifeq ($(DEB_HOST_GNU_CPU),powerpc)
-	confflags += --enable-runtime-cpudetection
+ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
+  confflags += --enable-runtime-cpudetection
 endif
-ifeq ($(DEB_HOST_GNU_CPU),sparc)
-        confflags += --target=generic
+ifeq ($(DEB_HOST_ARCH),powerpc)
+  confflags += --enable-runtime-cpudetection
 endif
 
 %:
@@ -57,3 +67,4 @@
 
 override_dh_clean:
 	dh_clean
+