diff --git a/package/Config.in b/package/Config.in
index 2cfaf371c..50827c4c5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,6 +22,7 @@ source "package/ebtables/Config.in"
 source "package/arptables/Config.in"
 source "package/iproute2/Config.in"
 source "package/openvpn/Config.in"
+source "package/openntpd/Config.in"
 source "package/pptp/Config.in"
 source "package/pptpd/Config.in"
 
diff --git a/package/Makefile b/package/Makefile
index 4018631a4..bf333d357 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -2,31 +2,32 @@
 include $(TOPDIR)/rules.mk
 
 package-y:=openwrt
+package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_BRIDGE) += bridge
 package-$(BR2_PACKAGE_BUSYBOX) += busybox
 package-$(BR2_PACKAGE_DROPBEAR) += dropbear
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_EBTABLES) += ebtables
-package-$(BR2_PACKAGE_ARPTABLES) += arptables
+package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_IPTABLES) += iptables
-package-$(BR2_PACKAGE_PPP) += ppp
+package-$(BR2_PACKAGE_IPROUTE2) += iproute2
+package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
+package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LZO) += lzo
-package-$(BR2_PACKAGE_ZLIB) += zlib
 package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_NCURSES) += ncurses
 package-$(BR2_PACKAGE_OPENSSL) += openssl
+package-$(BR2_PACKAGE_OPENNTPD) += openntpd
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_PACKAGE_POPT) += popt
+package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
-package-$(BR2_PACKAGE_IPROUTE2) += iproute2
-package-$(BR2_PACKAGE_HASERL) += haserl
-package-$(BR2_PACKAGE_MICROPERL) += microperl
-package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_STRACE) += strace
 package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
-package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
+package-$(BR2_PACKAGE_ZLIB) += zlib
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean
diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
new file mode 100644
index 000000000..06324d320
--- /dev/null
+++ b/package/openntpd/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_OPENNTPD
+	tristate "Openntpd"
+	default m
+	help
+	NTP server
+	http://www.openntpd.org
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
new file mode 100644
index 000000000..8094e5ef7
--- /dev/null
+++ b/package/openntpd/Makefile
@@ -0,0 +1,71 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openntpd
+PKG_VERSION:=3.6.1p1
+PKG_RELEASE:=1
+PKG_MD5SUM:=4584f226523776a3cdd2fb6f8212ba8d
+
+# space separated list or special @SF for sourceforge projects
+PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
+                ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/		
+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
+
+$(DL_DIR)/$(PKG_SOURCE):
+	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+
+$(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)/.configured: $(PKG_BUILD_DIR)/.unpacked
+	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--with-builtin-arc4random \
+	);
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/ntpd: $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR)
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/ntpd
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(PKG_IPK_DIR){/usr/sbin,/etc/init.d} 
+	cp $(PKG_BUILD_DIR)/ntpd $(PKG_IPK_DIR)/usr/sbin/
+	cp ./files/ntpd.conf $(PKG_IPK_DIR)/etc/
+	cp ./files/S49ntpd $(PKG_IPK_DIR)/etc/init.d/
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+	mkdir -p $(PACKAGE_DIR)
+	$(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)
+prepare: $(PKG_BUILD_DIR)/.unpacked
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
diff --git a/package/openntpd/files/S49ntpd b/package/openntpd/files/S49ntpd
new file mode 100755
index 000000000..e52874878
--- /dev/null
+++ b/package/openntpd/files/S49ntpd
@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir -p `grep "^ntp:" /etc/passwd | cut -d: -f6`
+/usr/sbin/ntpd -s
diff --git a/package/openntpd/files/ntpd.conf b/package/openntpd/files/ntpd.conf
new file mode 100644
index 000000000..6993b8eba
--- /dev/null
+++ b/package/openntpd/files/ntpd.conf
@@ -0,0 +1,3 @@
+# use a random selection of 8 public stratum 2 servers
+# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
+servers pool.ntp.org
diff --git a/package/openntpd/openntpd.control b/package/openntpd/openntpd.control
new file mode 100644
index 000000000..46e857ad0
--- /dev/null
+++ b/package/openntpd/openntpd.control
@@ -0,0 +1,8 @@
+Package: openntpd
+Priority: optional
+Section: net
+Version: 1.0-1
+Architecture: mipsel
+Maintainer: Foo Bar <openntpd@bar>
+Source: buildroot internal
+Description: openntpd template package