diff --git a/openwrt/package/haserl/Makefile b/openwrt/package/haserl/Makefile
index b4be1720e..a5c9a9826 100644
--- a/openwrt/package/haserl/Makefile
+++ b/openwrt/package/haserl/Makefile
@@ -7,35 +7,70 @@ PKG_VERSION := 0.8.0
 PKG_RELEASE := 1
 PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea
 
-PKG_SOURCE_SITE := @SF/haserl
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_SOURCE_URL := @SF/haserl
+PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT := zcat
 PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+$(DL_DIR)/$(PKG_SOURCE):
+	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PKG_BUILD_DIR)/.unpacked
 
-$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-#	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/bin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+	)
+	touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
-	cd $(PKG_BUILD_DIR); \
-	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-	./ipkg/rules package
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR)
+	touch $(PKG_BUILD_DIR)/.built
+
+$(PKG_INSTALL_DIR)/usr/bin/haserl: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  DESTDIR="$(PKG_INSTALL_DIR)" \
+	 install
+	
+$(PKG_IPK): $(PKG_INSTALL_DIR)/usr/bin/haserl
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(PKG_IPK_DIR)/usr/bin
+	cp -fp $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/bin/*
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 
 $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
 	$(IPKG) install $(PKG_IPK)
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: $(PKG_IPK)
 install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
diff --git a/openwrt/package/haserl/ipkg/haserl/CONTROL/control b/openwrt/package/haserl/haserl.control
similarity index 100%
rename from openwrt/package/haserl/ipkg/haserl/CONTROL/control
rename to openwrt/package/haserl/haserl.control
diff --git a/openwrt/package/haserl/ipkg/rules b/openwrt/package/haserl/ipkg/rules
deleted file mode 100644
index fd1659551..000000000
--- a/openwrt/package/haserl/ipkg/rules
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(strip ${IPKG_RULES_INC}),)
- include $(IPKG_RULES_INC)
-endif
-
-##
-
-PKG_VERSION := $(shell cat ./ipkg/version)
-CURRENT_DIR := $(shell pwd)
-INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
-
-unexport INSTALL_DIR
-
-I_HASERL := ipkg/haserl
-
-BUILD_DEPS := \
-
-CONFIGURE_OPTS = \
-	--enable-variable-prefix="" \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
-	rm -rf config.cache
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --program-prefix="" \
-	  --program-suffix="" \
-	  --prefix=/usr \
-	  --exec-prefix=/usr \
-	  --bindir=/usr/bin \
-	  --datadir=/usr/share \
-	  --includedir=/usr/include \
-	  --infodir=/usr/share/info \
-	  --libdir=/usr/lib \
-	  --libexecdir=/usr/lib \
-	  --localstatedir=/var \
-	  --mandir=/usr/share/man \
-	  --sbindir=/usr/sbin \
-	  --sysconfdir=/etc \
-	  $(DISABLE_LARGEFILE) \
-	  $(DISABLE_NLS) \
-	  $(CONFIGURE_OPTS) \
-
-	touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
-	$(MAKE) \
-	  $(TARGET_CONFIGURE_OPTS) \
-
-	touch .stamp-built
-
-
-$(INSTALL_DIR)/usr/bin/haserl: .stamp-built
-
-	mkdir -p $(INSTALL_DIR)
-
-	$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 install
-	
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/usr/bin/haserl
-
-
-package: $(INSTALL_DIR)/usr/bin/haserl
-
-	mkdir -p $(I_HASERL)/usr/bin
-	cp -af $(INSTALL_DIR)/usr/bin/haserl $(I_HASERL)/usr/bin/
-	$(STRIP) $(I_HASERL)/usr/bin/*
-
-	chmod 0755 ipkg/*/CONTROL/
-	chmod 0644 ipkg/*/CONTROL/control
-
-	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
-ifneq ($(strip $(PKG_VERSION)),)
-	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
-endif
-
-	$(IPKG_BUILD) $(I_HASERL) $(IPKG_TARGET_DIR)
-
-
-clean:
-
-	-$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 uninstall clean
-
-	rm -rf \
-	  .stamp-* \
-	  $(I_HASERL)/usr
-
-
-control:
-
-	@cat $(I_HASERL)/CONTROL/control
-	@echo
-	
-
-.PHONY: configure build install package clean control
diff --git a/openwrt/package/haserl/ipkg/version b/openwrt/package/haserl/ipkg/version
deleted file mode 100644
index 8e9761808..000000000
--- a/openwrt/package/haserl/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-0.8.0-1