diff --git a/srcpkgs/cpuburn/patches/01-variables.patch b/srcpkgs/cpuburn/patches/01-variables.patch
new file mode 100644
index 00000000000..e855428eea3
--- /dev/null
+++ b/srcpkgs/cpuburn/patches/01-variables.patch
@@ -0,0 +1,40 @@
+--- burnK7.S
++++ burnK7.S
+@@ -74,6 +74,7 @@ int_exit:
+ 	push	%eax
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ 	.fill 64
+ half:	.long 0x7fffffff,0
+--- burnP5.S
++++ burnP5.S
+@@ -77,6 +77,7 @@ crunch:
+ #else
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0xffffffff,0x3fdfffff
+ one:	.long 0xffffffff,0x3fefffff
+--- burnP6.S
++++ burnP6.S
+@@ -69,6 +69,7 @@ int_exit:			# error abort
+ 	push	%eax		# *BSD syscall
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0x7fffffff,0
+ e:	.long 0xffffffff,0x3fdfffff
+--- burnK6.S
++++ burnK6.S
+@@ -68,6 +68,7 @@ int_exit:
+ 	push	%eax
+ 	int	$0x80
+ #endif
++.data				# Data allocation
+ .align 32,0
+ half:	.long 0x7fffffff,0
+ e:	.long 0xffffffff,0x3fdfffff
diff --git a/srcpkgs/cpuburn/patches/02-m32.patch b/srcpkgs/cpuburn/patches/02-m32.patch
new file mode 100644
index 00000000000..44a30bc89ef
--- /dev/null
+++ b/srcpkgs/cpuburn/patches/02-m32.patch
@@ -0,0 +1,7 @@
+--- Makefile
++++ Makefile
+@@ -1,3 +1,3 @@
+ all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX
+ .S:
+-	gcc -s -nostdlib -o $@ $<
++	gcc -m32 -s -nostdlib -o $@ $<
diff --git a/srcpkgs/cpuburn/template b/srcpkgs/cpuburn/template
new file mode 100644
index 00000000000..0134ff9e323
--- /dev/null
+++ b/srcpkgs/cpuburn/template
@@ -0,0 +1,38 @@
+# Template file for 'cpuburn'
+pkgname=cpuburn
+only_for_archs="armv6l armv7l i686 x86_64"
+version=1.4a
+revision=1
+short_desc="Collection of programs to put heavy load on CPU"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="GPL-2"
+homepage="https://launchpad.net/ubuntu/+source/cpuburn/"
+distfiles="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${version}.orig.tar.gz"
+checksum=eb191ce9bfbf453d30c218c3419573df102a3588f96c4a43686c84bb9da4bed6
+
+do_build() {
+    case "$XBPS_TARGET_MACHINE" in
+      i686*|x86_64*) make CC="$CC";;
+      arm*) make -C ARM CC="$CC";;
+    esac    
+}
+
+do_install() {
+    vdoc README
+    case "$XBPS_TARGET_MACHINE" in
+      i686*|x86_64*)
+	vbin burnBX
+	vbin burnK6
+	vbin burnK7
+	vbin burnMMX
+	vbin burnP5
+	vbin burnP6
+        vdoc Design
+        ;;
+      arm*)
+        vbin ARM/burnCortexA8 
+        vbin ARM/burnCortexA9 
+        vdoc ARM/Design
+        ;;
+   esac
+}