diff --git a/endptcfg-open/Makefile b/endptcfg-open/Makefile
deleted file mode 100644
index b2d79e6f9..000000000
--- a/endptcfg-open/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=endptcfg-open
-PKG_VERSION:=15-06-24
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ihgsp.inteno.se/ihgsp/consumer/
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/image.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-
-define Package/endptcfg-open
-  CATEGORY:=Utilities
-  TITLE:=Broadcom endpoint driver configuration application pre compiled for open SDK
-  URL:=
-endef
-
-define Package/endptcfg-open/description
-        Broadcom endpoint driver configuration application pre compiled for open SDK
-endef
-
-
-
-define Package/endptcfg-open/install
-mkdir -p $(1)/usr/bin/
-ifeq ($(CONFIG_BCM_CHIP_ID),"63138")
-         $(CP)  $(PKG_BUILD_DIR)/endptcfg_arm $(1)/usr/bin/endptcfg	
-	
-else
-	$(CP)  $(PKG_BUILD_DIR)/endptcfg_mips $(1)/usr/bin/endptcfg
-endif	 	
-
-endef
-
-$(eval $(call BuildPackage,endptcfg-open))
diff --git a/endptcfg/Makefile b/endptcfg/Makefile
index 82656d6e1..b36ed0531 100644
--- a/endptcfg/Makefile
+++ b/endptcfg/Makefile
@@ -9,12 +9,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptcfg
 PKG_VERSION:=0.2
-PKG_RELEASE:=1
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@iopsys.inteno.se:endptcfg
+
 PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+ifeq ($(CONFIG_BCM_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_NAME:=endptcfg-open
+else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=git@iopsys.inteno.se:endptcfg
+PKG_SOURCE_PROTO:=git
+endif
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 LDFLAGS+= \
         -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -50,6 +58,7 @@ define Package/endptcfg/description
 	Broadcom endpoint driver configuration application
 endef
 
+ifneq ($(CONFIG_BCM_OPEN),y)
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) LINUX_DIR=$(LINUX_DIR) LDFLAGS="$(TARGET_LDFLAGS)" CFLAGS="$(TARGET_CFLAGS) \
@@ -68,6 +77,10 @@ define Build/Compile
 			-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/private/apps/vodsl/voip/inc \
 			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_common/bos/LinuxUser"
 endef
+else
+define Build/Compile
+endef
+endif
 
 define Package/endptcfg/install
 	$(INSTALL_DIR) $(1)/usr/bin