diff --git a/devel/make/Makefile b/devel/make/Makefile
index 0430d4c10..8ab18caf3 100644
--- a/devel/make/Makefile
+++ b/devel/make/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/make
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:=+libelf
+  DEPENDS:=+libelf1
   TITLE:=make
   URL:=http://www.gnu.org/software/make/
 endef
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 8fd1c4fcc..f19d68b29 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -38,7 +38,7 @@ define Package/libnetsnmp
 $(call Package/net-snmp/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libelf
+  DEPENDS:=+libelf1
   TITLE:=Open source SNMP implementation (libraries)
 endef
 
@@ -78,7 +78,7 @@ endef
 define Package/snmpd-static
 $(call Package/net-snmp/Default)
   TITLE:=Open source SNMP implementation (daemon)
-  DEPENDS:=+libelf
+  DEPENDS:=+libelf1
 endef
 
 define Package/snmpd-static/description
diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 514b6744d..881887c51 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -17,7 +17,7 @@ PKG_MD5SUM:=00df80a84ec9528fcfb09498075525bc
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_BUILD_DEPENDS:=libelf
+PKG_BUILD_DEPENDS:=libelf1
 PKG_FIXUP:=autoreconf
 PKG_LIBTOOL_PATHS:=. sntp
 
@@ -117,9 +117,6 @@ define Package/ntpd/conffiles
 /etc/ntp.conf
 endef
 
-TARGET_CPPFLAGS += \
-	-I$(STAGING_DIR)/usr/include/libelf
-
 CONFIGURE_VARS += \
 	ac_cv_header_md5_h=no \
 	ac_cv_lib_rt_sched_setscheduler=no \
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 07cf9e26c..e6d5c0514 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -25,7 +25,7 @@ define Package/pure-ftpd/Default
   SUBMENU:=File Transfer
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libelf
+  DEPENDS:=+libelf1
   TITLE:=Secure FTP made easy!
   URL:=http://www.pureftpd.org/project/pure-ftpd
 endef
diff --git a/utils/at/Makefile b/utils/at/Makefile
index faa8e51bf..7c02fb86e 100644
--- a/utils/at/Makefile
+++ b/utils/at/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/at
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libelf
+  DEPENDS:=+libelf1
   TITLE:=Delayed job execution and batch processing
   URL:=http://packages.debian.org/stable/at
   MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
@@ -32,7 +32,7 @@ define Package/at/description
 endef
 
 export SENDMAIL=/bin/true
-EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include/libelf \
+EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) \
 	$(TARGET_LDFLAGS)
 
 CONFIGURE_ARGS+=--prefix=/usr \
diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile
index a3f3c0a9c..2b284f5e3 100644
--- a/utils/coreutils/Makefile
+++ b/utils/coreutils/Makefile
@@ -33,7 +33,7 @@ COREUTILS_APPLETS := \
 
 DEPENDS_sort = +libpthread
 DEPENDS_timeout = +librt
-DEPENDS_uptime = +libelf
+DEPENDS_uptime = +libelf1
 DEPENDS_expr = +libgmp
 DEPENDS_factor = +libgmp