diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index f1bfd4f44..31c47b427 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
-PKG_VERSION:=4.2.6p5
-PKG_RELEASE:=2
+PKG_VERSION:=4.2.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
-PKG_MD5SUM:=00df80a84ec9528fcfb09498075525bc
+PKG_MD5SUM:=6972a626be6150db8cfbd0b63d8719e7
 
 PKG_LICENSE:=Unique
 PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf
 PKG_LIBTOOL_PATHS:=. sntp
@@ -45,7 +45,8 @@ endef
 define Package/ntpd
 $(call Package/ntpd/Default)
   TITLE+= server
-  VARIANT:=nossl
+  USERID:=ntp=123:ntp=123
+  DEPENDS+= +libopenssl +libpthread
   USERID:=ntp=123:ntp=123
 endef
 
@@ -55,24 +56,9 @@ $(call Package/ntpd/Default/description)
  This package contains the ntpd server.
 endef
 
-define Package/ntpd-ssl
-$(call Package/ntpd/Default)
-  TITLE+= server (with OpenSSL support)
-  VARIANT:=ssl
-  DEPENDS+= +libopenssl
-  USERID:=ntp=123:ntp=123
-endef
-
-define Package/ntpd-ssl/description
-$(call Package/ntpd/Default/description)
- .
- This package contains the ntpd server with OpenSSL support.
-endef
-
 define Package/ntpdate
 $(call Package/ntpd/Default)
   TITLE+=date
-  VARIANT:=nossl
 endef
 
 define Package/ntpdate/description
@@ -84,7 +70,7 @@ endef
 define Package/ntp-utils
 $(call Package/ntpd/Default)
   TITLE+= utilities
-  VARIANT:=nossl
+  DEPENDS+= +libpthread +libopenssl
 endef
 
 define Package/ntp-utils/description
@@ -96,7 +82,7 @@ endef
 define Package/ntp-keygen
 $(call Package/ntpd/Default)
   TITLE+=keygen
-  VARIANT:=nossl
+  DEPENDS+= +libopenssl +libpthread
 endef
 
 define Package/ntp-keygen/description
@@ -105,19 +91,6 @@ $(call Package/ntpd/Default/description)
  This package contains the ntp-keygen.
 endef
 
-define Package/ntp-keygen-ssl
-$(call Package/ntpd/Default)
-  TITLE+=keygen (with OpenSSL support)
-  VARIANT:=ssl
-  DEPENDS+= +libopenssl
-endef
-
-define Package/ntp-keygen-ssl/description
-$(call Package/ntpd/Default/description)
- .
- This package contains the ntp-keygen with OpenSSL support.
-endef
-
 define Package/ntpd/conffiles
 /etc/ntp.conf
 endef
@@ -135,14 +108,11 @@ CONFIGURE_ARGS += \
 	--enable-NMEA \
 	--enable-LOCAL-CLOCK \
 	--enable-SHM \
-	--enable-linuxcaps
-
-ifeq ($(BUILD_VARIANT),ssl)
-  CONFIGURE_ARGS += \
+	--enable-linuxcaps \
+	--with-yielding-select=yes \
 	--with-crypto \
 	--with-openssl-incdir="$(STAGING_DIR)/usr/include" \
 	--with-openssl-libdir="$(STAGING_DIR)/usr/lib"
-endif
 
 define Package/ntpd/install
 	$(INSTALL_DIR) $(1)/sbin
@@ -192,8 +162,6 @@ endef
 Package/ntp-keygen-ssl/install = $(Package/ntp-keygen/install)
 
 $(eval $(call BuildPackage,ntpd))
-$(eval $(call BuildPackage,ntpd-ssl))
 $(eval $(call BuildPackage,ntpdate))
 $(eval $(call BuildPackage,ntp-utils))
 $(eval $(call BuildPackage,ntp-keygen))
-$(eval $(call BuildPackage,ntp-keygen-ssl))