diff --git a/tr064/.cproject b/tr064/.cproject
new file mode 100644
index 000000000..4d0006e2a
--- /dev/null
+++ b/tr064/.cproject
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tr064/.project b/tr064/.project
new file mode 100755
index 000000000..86fd639ee
--- /dev/null
+++ b/tr064/.project
@@ -0,0 +1,27 @@
+
+
+ tr064
+
+
+ openssl-1.0.2i
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
diff --git a/tr064/.settings/language.settings.xml b/tr064/.settings/language.settings.xml
new file mode 100644
index 000000000..564c979e6
--- /dev/null
+++ b/tr064/.settings/language.settings.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tr064/Makefile b/tr064/Makefile
new file mode 100755
index 000000000..e058dea95
--- /dev/null
+++ b/tr064/Makefile
@@ -0,0 +1,82 @@
+# Copyright (C) 2017 PIVA Software
+# Author: OMAR Kallel
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tr064
+PKG_VERSION:=1.0
+PKG_SOURCE_URL:=git@public.inteno.se:tr064.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=e53d492a09c433718a520987c419cb6a4d4ae8dc
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_TR064_DEBUG \
+ CONFIG_TR064_DEVEL
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tr064
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=tr064
+ DEPENDS:=+libubus +libuci +libubox +libmicroxml +libjson-c +libpthread +libdatamodel +libopenssl +libubus +libubox
+endef
+
+define Package/tr064/description
+ TR-064 protocol
+endef
+
+TARGET_CFLAGS += \
+ -D_GNU_SOURCE
+
+TARGET_LDFLAGS += \
+ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+CONFIGURE_ARGS += \
+ --with-uci-include-path=$(STAGING_DIR)/usr/include \
+ --with-libubox-include-path=$(STAGING_DIR)/usr/include \
+ --with-libubus-include-path=$(STAGING_DIR)/usr/include
+
+ifeq ($(CONFIG_TR064_DEBUG),y)
+CONFIGURE_ARGS += \
+ --enable-debug
+endif
+
+ifeq ($(CONFIG_TR064_DEVEL),y)
+CONFIGURE_ARGS += \
+ --enable-devel
+endif
+
+CONFIGURE_ARGS += \
+ --enable-jsonc=1
+
+define Package/tr064/conffiles
+/etc/config/tr064
+endef
+
+define Package/tr064/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_DIR) $(1)/etc/upnp-md
+ $(INSTALL_DIR) $(1)/etc/upnp-md/web
+ $(INSTALL_DIR) $(1)/etc/upnp-md/x509
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp-md-pupnp/upnp-md $(1)/usr/bin
+ $(CP) $(PKG_BUILD_DIR)/web/*.xml $(1)/etc/upnp-md/web
+ $(CP) $(PKG_BUILD_DIR)/tools/parse_ftp_server_log.sh $(1)/usr/bin
+ $(CP) $(PKG_BUILD_DIR)/tools/kill_child.sh $(1)/usr/bin
+ $(CP) $(PKG_BUILD_DIR)/x509/*.pem $(1)/etc/upnp-md/x509
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/upnp-md.conf $(1)/etc/upnp-md
+ $(CP) $(PKG_BUILD_DIR)/conf/DMconf.xml $(1)/etc/upnp-md
+ $(CP) $(PKG_BUILD_DIR)/conf/CPID.csv $(1)/etc/upnp-md
+ $(CP) $(PKG_BUILD_DIR)/conf/tr064 $(1)/etc/config
+ $(CP) $(PKG_BUILD_DIR)/conf/tr064d $(1)/etc/init.d
+ chmod 0744 $(1)/etc/init.d/tr064d
+endef
+
+$(eval $(call BuildPackage,tr064))