diff --git a/CMakeLists.txt b/CMakeLists.txt
index d33a93fa..d155e1d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,9 +108,9 @@ ENDIF( NOT USE_ASM_CORE )
 
 # Compiler flags
 IF ( WIN32 )
-    SET( CMAKE_ASM_FLAGS "-Isrc/filters/hq/asm/ -O1 -w-orphan-labels")
+    SET( CMAKE_ASM_FLAGS "-I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -w-orphan-labels")
 ELSE ( WIN32 )
-    SET( CMAKE_ASM_FLAGS "-Isrc/filters/hq/asm/ -O1 -DELF -w-orphan-labels")
+    SET( CMAKE_ASM_FLAGS "-I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -DELF -w-orphan-labels")
 ENDIF ( WIN32 )
 SET( CMAKE_C_FLAGS "-O3 -Wall")
 SET( CMAKE_CXX_FLAGS "-O3 -Wall")
diff --git a/debian/changelog b/debian/changelog
index 18505f41..e57d9fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vbam (1.8.0.913-1) unstable; urgency=low
+
+  * Using assembly optmizations for i386 and amd64 platforms
+
+ -- Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com>  Sat, 03 Oct 2009 22:41:55 -0300
+
 vbam (1.8.0.912-1) unstable; urgency=low
 
   * Added libglademm-2.4-dev as a build-time dependency
diff --git a/debian/control b/debian/control
index 39052d12..33df879b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: vbam
 Section: otherosfs
 Priority: optional
 Maintainer: Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com>
-Build-Depends: debhelper (>= 7), cmake, libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libglademm-2.4-dev
+Build-Depends: debhelper (>= 7), cmake, nasm [i386 amd64], libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libglademm-2.4-dev
 Standards-Version: 3.8.1
 Homepage: http://www.vbam.com
 
 Package: vbam
-Architecture: i386
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Nintendo Game Boy Advance emulator
  VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility
diff --git a/debian/rules b/debian/rules
index 78c9d990..c90dfbc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,31 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# vi: ts=4 sw=4 noet
+#
+# debian/rules file that uses debhelper
+# Based on an autogenerated debhelper sample
+#
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 
+EXTRA_CMAKE_FLAGS =
 
+ifeq ($(DH_VERBOSE),1)
+	EXTRA_CMAKE_FLAGS += -DCMAKE_VERBOSE_MAKEFILE=ON
+endif
 
+ifneq (,$(filter $(DEB_BUILD_ARCH_CPU),i386 amd64))
+	EXTRA_CMAKE_FLAGS += -DUSE_ASM_SCALERS=ON -DUSE_ASM_CORE=ON
+endif
 
 builddir/Makefile:
 	dh_testdir
 	# Add here commands to configure the package.
 	mkdir -p builddir
-	cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON
+	cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS)
 
 
 build: build-stamp