diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build
index 33f4674787..ffab01459b 100755
--- a/packages/tools/atv-bootloader/build
+++ b/packages/tools/atv-bootloader/build
@@ -24,10 +24,11 @@
 
 cd $PKG_BUILD
 
+rm -rf mach_kernel vmlinuz initrd.gz
 cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
 
 make clean
-make LDFLAGS="" \
+make LDFLAGS="" KERN_OBJ=vmlinuz.obj \
      CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
      LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"
 
diff --git a/packages/tools/atv-bootloader/meta b/packages/tools/atv-bootloader/meta
index a36407a00b..e69c7933d6 100644
--- a/packages/tools/atv-bootloader/meta
+++ b/packages/tools/atv-bootloader/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="atv-bootloader"
-PKG_VERSION="r518"
+PKG_VERSION="r520"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/atv-bootloader/"
-PKG_URL="http://travisghansen.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain darwin-cross linux"
 PKG_PRIORITY="optional"
diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch
deleted file mode 100644
index f36755a91e..0000000000
--- a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
---- atv-bootloader-r518/Makefile	2010-03-09 20:17:22.000000000 +0100
-+++ atv-bootloader-r518.patch/Makefile	2011-05-21 15:26:26.509551389 +0200
-@@ -22,7 +22,7 @@
- # start.o must be 1st in the link order (ld below)
- OBJ	= start.o vsprintf.o console.o utils.o elilo_code.o darwin_code.o linux_code.o boot_loader.o
- 
--KERN_OBJ= vmlinuz.obj initrd.obj
-+KERN_OBJ:= vmlinuz.obj initrd.obj
- 
- mach_kernel: $(KERN_OBJ) $(OBJ)
- 	$(LD) $(LDFLAGS) -arch $(ARCH) -o mach_kernel $(OBJ) $(KERN_OBJ) \
diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch
deleted file mode 100644
index 4bca96c210..0000000000
--- a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
---- atv-bootloader-r518/Makefile	2010-03-09 20:17:22.000000000 +0100
-+++ atv-bootloader-r518.patch/Makefile	2011-05-21 14:04:05.592144598 +0200
-@@ -11,12 +11,12 @@
- 
- # if Linxu, use the darwin-cross tools to compile/link
- ifeq ($(OSTYPE),Linux)
--  CC  = /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
--  LD  = /opt/darwin-cross/bin/i386-apple-darwin8-ld
-+  CC  := /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
-+  LD  := /opt/darwin-cross/bin/i386-apple-darwin8-ld
- else
--  CC  = /usr/bin/gcc-4.0
--  LD  = /usr/bin/ld
--	LDFLAGS = -classic_linker
-+  CC  := /usr/bin/gcc-4.0
-+  LD  := /usr/bin/ld
-+  LDFLAGS = -classic_linker
- endif
- 
- # start.o must be 1st in the link order (ld below)
-@@ -53,7 +53,4 @@
- clean:
- 	rm -f *.o $(KERN_OBJ) mach_kernel
- 
--
--
- #xxd mach_kernel | sed -e "s/ffff ffff 1000/0100 0000 1000/" | xxd -r - mach_kernel
--
diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch
similarity index 100%
rename from packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch
rename to packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch