diff --git a/nlove/Makefile b/nlove/Makefile
index 6328b0a..d06cb71 100755
--- a/nlove/Makefile
+++ b/nlove/Makefile
@@ -1,12 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nlove
-PKG_VERSION:=0.0.2
+PKG_REV:=445
+PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dl.dropbox.com/u/440010/nlove/
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=https://bitbucket.org/bartbes/nlove
+PKG_SOURCE_PROTO:=hg
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -25,33 +28,14 @@ define Package/nlove/description
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR);\
-	 IN_OPENWRT=1 \
-	 AR="$(TARGET_CROSS)ar" \
-	 AS="$(TARGET_CC) -c $(TARGET_CFLAGS) $(TARGET_COPTS)" \
-	 LD="$(TARGET_CROSS)ld" \
-	 NM="$(TARGET_CROSS)nm" \
-	 CC="$(TARGET_CC)" \
-	 GCC="$(TARGET_CC)" \
-	 CXX="$(TARGET_CROSS)g++" \
-	 RANLIB="$(TARGET_CROSS)ranlib" \
-	 STRIP="$(TARGET_CROSS)strip" \
-	 OBJCOPY="$(TARGET_CROSS)objcopy" \
-	 OBJDUMP="$(TARGET_CROSS)objdump" \
-	 TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	 TARGET_CFLAGS="$(TARGET_CFLAGS) $(TARGET_COPTS)" \
-	 TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-	 STAGING_DIR="$(STAGING_DIR)" \
-	 CFLAGS="-fhonour-copts -std=gnu99" \
-	 CXXFLAGS="-fhonour-copts" \
-	cmake . -DCMAKE_CXX_FLAGS=-g);$
 endef
 
 define Build/Compile
-	(cd $(PKG_BUILD_DIR); \
-	CFLAGS="-fhonour-copts --std=gnu99" \
-	CXXFLAGS="-fhonour-copts --std=gnu99" \
-	make);$
+	(cd $(PKG_BUILD_DIR);\
+	 STAGING_DIR="$(STAGING_DIR)" \
+	 CFLAGS="-fhonour-copts -std=gnu99" \
+	 PLATFORM="NanoNote" \
+	platform/nlove/build.sh);$
 endef
 
 
diff --git a/nlove/patches/001-c99.patch b/nlove/patches/001-c99.patch
new file mode 100644
index 0000000..9103164
--- /dev/null
+++ b/nlove/patches/001-c99.patch
@@ -0,0 +1,10 @@
+--- nlove/src/common/runtime.h	2010-08-10 13:31:20.000000000 +0200
++++ nlovem/src/common/runtime.h	2010-08-10 13:42:15.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "types.h"
+ 
+ // Lua
++#define __STDC_VERSION__ 199901L
+ extern "C" {
+ 	#include <lua.h>
+ 	#include <lualib.h>
diff --git a/nlove/patches/001-cmake.patch b/nlove/patches/001-cmake.patch
deleted file mode 100644
index a0c4967..0000000
--- a/nlove/patches/001-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- sdltest-2.2.0/CMakeLists.txt	2010-08-04 11:50:25.000000000 +0200
-+++ sdltest-2.2.0m/CMakeLists.txt	2010-08-04 12:23:43.000000000 +0200
-@@ -1,13 +1,13 @@
- cmake_minimum_required (VERSION 2.8)
- 
--set(PHYSFS_INCLUDE /usr/include/)
--set(PHYSFS_LIBRARY physfs)
--set(LUA_INCLUDE /usr/include/lua5.1)
--set(LUA_LIBRARY lua5.1)
--set(SDL_INCLUDE /usr/include/SDL)
--set(SDL_LIBRARY SDL SDL_image SDL_gfx SDL_mixer)
--set(FREETYPE_INCLUDE /usr/include/freetype2)
--set(FREETYPE_LIBRARY freetype)
-+set(PHYSFS_INCLUDE $ENV{STAGING_DIR}/usr/include/)
-+set(PHYSFS_LIBRARY $ENV{STAGING_DIR}/usr/lib/libphysfs.so)
-+set(LUA_INCLUDE $ENV{STAGING_DIR}/usr/include/lua)
-+set(LUA_LIBRARY $ENV{STAGING_DIR}/usr/lib/liblua.so crypt)
-+set(SDL_INCLUDE $ENV{STAGING_DIR}/usr/include/SDL)
-+set(SDL_LIBRARY $ENV{STAGING_DIR}/usr/lib/libSDL.so $ENV{STAGING_DIR}/usr/lib/libSDL_image.so $ENV{STAGING_DIR}/usr/lib/libSDL_gfx.so $ENV{STAGING_DIR}/usr/lib/libSDL_mixer.so)
-+set(FREETYPE_INCLUDE $ENV{STAGING_DIR}/usr/include/freetype2)
-+set(FREETYPE_LIBRARY $ENV{STAGING_DIR}/usr/lib/libfreetype.so)
- 
- include_directories(${PHYSFS_INCLUDE} ${LUA_INCLUDE} ${SDL_INCLUDE} $(FREETYPE_INCLUDE})
- include_directories(".")
diff --git a/nlove/patches/002-deviceconfig.patch b/nlove/patches/002-deviceconfig.patch
deleted file mode 100644
index 20c85bb..0000000
--- a/nlove/patches/002-deviceconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sdltest-2.1.0/common/config.h	2010-08-04 11:41:07.000000000 +0200
-+++ sdltest-2.1.0m/common/config.h	2010-08-10 15:09:02.000000000 +0200
-@@ -35,6 +35,8 @@
- #	define LOVE_MACOS 1
- #endif
- 
-+#define LOVE_LINUX 1
-+
- // Endianness.
- #if defined(__i386__) || defined(__i386)
- #	define LOVE_LITTLE_ENDIAN 1
-@@ -43,6 +45,8 @@
- #	define LOVE_BIG_ENDIAN 1
- #endif
- 
-+#define LOVE_LITTLE_ENDIAN 1
-+
- // Warnings.
- #ifndef _CRT_SECURE_NO_WARNINGS
- #	define _CRT_SECURE_NO_WARNINGS
diff --git a/nlove/patches/003-c99.patch b/nlove/patches/003-c99.patch
deleted file mode 100644
index 9d0042a..0000000
--- a/nlove/patches/003-c99.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sdltest-2.1.0/common/runtime.h	2010-08-10 13:31:20.000000000 +0200
-+++ sdltest-2.1.0m/common/runtime.h	2010-08-10 13:42:15.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "types.h"
- 
- // Lua
-+#define __STDC_VERSION__ 199901L
- extern "C" {
- 	#include <lua.h>
- 	#include <lualib.h>