diff --git a/openwrt/package/ipset/Config.in b/openwrt/package/ipset/Config.in
deleted file mode 100644
index 293292cfea..0000000000
--- a/openwrt/package/ipset/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_IPSET
-	prompt "ipset............................. Netfilter ip sets administration utility"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  Netfilter ip sets administration utility
-	  
-	  http://ipset.netfilter.org/
-
diff --git a/openwrt/package/ipset/Makefile b/openwrt/package/ipset/Makefile
index 8369b29bfd..ffaabc6fe9 100644
--- a/openwrt/package/ipset/Makefile
+++ b/openwrt/package/ipset/Makefile
@@ -7,28 +7,28 @@ PKG_VERSION:=2.2.3
 PKG_RELEASE:=1
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 
-PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
+PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_CAT:=bzcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,IPSET,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/ipset
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+DEPENDS:=kmod-iptables-extra
+TITLE:=Netfilter ip sets administration utility
+DESCRIPTION:=Netfilter ip sets administration utility
+URL:=http://ipset.netfilter.org/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-		CFLAGS="$(TARGET_CFLAGS) -Wall -I$(LINUX_DIR)/include -I." \
-		KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr
-	touch $@
-
-$(IPKG_IPSET):
+define Package/ipset/install
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
 	rm -rf $(IDIR_IPSET)/usr/man
 	$(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)
+endef
 
+$(eval $(call BuildPackage,ipset))
diff --git a/openwrt/package/ipset/ipkg/ipset.control b/openwrt/package/ipset/ipkg/ipset.control
deleted file mode 100644
index f7f6ae0e63..0000000000
--- a/openwrt/package/ipset/ipkg/ipset.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ipset
-Priority: optional
-Section: net
-Description: Netfilter ip sets administration utility
-Depends: kmod-iptables-extra