-define Package/kmod-zd1211
-SECTION:=drivers
-CATEGORY:=Drivers
-DEPENDS:=@LINUX_2_6
-TITLE:=Driver for Zydas 1211 based USB devices
-DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\
-Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip.\\\
-Initially contributed by ZyDAS, this driver is actively maintained by the \\\
-open source community.
-URL:=http://zd1211.ath.cx/
-VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+define KernelPackage/zd1211
+ SUBMENU:=Wireless Drivers
+ DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
+ TITLE:=Driver for Zydas 1211 based USB devices
+ DESCRIPTION:=\
+ This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\
+ USB-WLAN-Chip.\\\
+ Initially contributed by ZyDAS, this driver is actively maintained by the \\\
+ open source community.
+ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+ FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,60,zd1211)
+endef
+
+define Package/zd1211-utils
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=zd1211 user-space utilities
+ DESCRIPTION:=zd1211 user-space utilities : apdbg, zd1211-sta