diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile
index be5fe3833..aa6dc3dd8 100644
--- a/net/dhcp-forwarder/Makefile
+++ b/net/dhcp-forwarder/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp-forwarder
-PKG_VERSION:=0.8
+PKG_VERSION:=0.10
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd
-PKG_MD5SUM:=fb3670dee9f71af1e55ac5dcd64e213e
+PKG_MD5SUM:=3b96dd27f6d05502d4048acab453808d
 
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_ARGS += \
-  --disable-dietlibc
+	--disable-dietlibc
 
 define Package/dhcp-forwarder
   SECTION:=net
@@ -28,12 +28,6 @@ define Package/dhcp-forwarder
   URL:=http://www.nongnu.org/dhcp-fwd/
 endef
 
-define Package/dhcp-forwarder/conffiles
-/etc/dhcp-fwd.conf
-endef
-
-# uses GNU configure
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		cfg_filename="/etc/dhcp-fwd.conf" \
@@ -41,12 +35,14 @@ define Build/Compile
 		all install
 endef
 
+define Package/dhcp-forwarder/conffiles
+/etc/dhcp-fwd.conf
+endef
+
 define Package/dhcp-forwarder/install
-	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd
 endef
 
diff --git a/net/dhcp-forwarder/files/dhcp-fwd.init b/net/dhcp-forwarder/files/dhcp-fwd.init
index 6b66c0f1e..b3d2375f5 100644
--- a/net/dhcp-forwarder/files/dhcp-fwd.init
+++ b/net/dhcp-forwarder/files/dhcp-fwd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+
 START=50
 
 LOG_D=/var/log
@@ -15,4 +15,3 @@ start() {
 stop() {
 	[ -f $PID_F ] && kill $(cat $PID_F)
 }
-