diff --git a/openwrt/package/dnsmasq/Config.in b/openwrt/package/dnsmasq/Config.in
deleted file mode 100644
index b20bf73620..0000000000
--- a/openwrt/package/dnsmasq/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_DNSMASQ
-	prompt "dnsmasq........................... Lightweight DNS and DHCP server"
-	tristate
-	default y
-	help
-	  A lightweight DNS and DHCP server.  It is intended to provide 
-	  coupled DNS and DHCP service to a LAN.
-	  
-	  http://www.thekelleys.org.uk/dnsmasq/
-
diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile
index 88bd9f21b9..19c6d35627 100644
--- a/openwrt/package/dnsmasq/Makefile
+++ b/openwrt/package/dnsmasq/Makefile
@@ -5,32 +5,33 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.27
 PKG_RELEASE:=1
-PKG_MD5SUM:=489198ec87101087043adc98bbe062dc
 
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_MD5SUM:=489198ec87101087043adc98bbe062dc
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/dnsmasq
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=A lightweight DNS and DHCP server
+DESCRIPTION:=A lightweight DNS and DHCP server.  It is intended to provide \\\
+coupled DNS and DHCP service to a LAN.
+URL:=http://www.thekelleys.org.uk/dnsmasq/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
-		BINDIR=/usr/sbin MANDIR=/usr/man
-	touch $@
-
-$(IPKG_DNSMASQ):
+define Package/dnsmasq/install
 	install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
-	$(STRIP) $(IDIR_DNSMASQ)/usr/sbin/*
 	install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/
+	install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/
 	install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
 	install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
+	$(RSTRIP) $(IDIR_DNSMASQ)
 	$(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)
+endef
 
+$(eval $(call BuildPackage,dnsmasq))
diff --git a/openwrt/package/dnsmasq/ipkg/dnsmasq.conffiles b/openwrt/package/dnsmasq/ipkg/dnsmasq.conffiles
deleted file mode 100644
index e30eba8f66..0000000000
--- a/openwrt/package/dnsmasq/ipkg/dnsmasq.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/dnsmasq.conf
diff --git a/openwrt/package/dnsmasq/ipkg/dnsmasq.control b/openwrt/package/dnsmasq/ipkg/dnsmasq.control
deleted file mode 100644
index 6f61edc656..0000000000
--- a/openwrt/package/dnsmasq/ipkg/dnsmasq.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dnsmasq
-Priority: essential
-Section: net
-Description: A lightweight DNS and DHCP server