diff --git a/.gitmodules b/.gitmodules
index fcf98700fa3b639b9f0bd95b06ead943d1519507..cb15070fddab07af95f1ae6bb1f710137ce31956 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "m-epics-sis8300llrf"]
 	path = m-epics-sis8300llrf
 	url = https://bitbucket.org/europeanspallationsource/m-epics-sis8300llrf
-	ignore = all
+	ignore = dirty
diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE
index 46600269d64fbc503b5c3e0378d534406086b490..4d122e39a5f328587c42a27c401c47c1dbfaa5c9 100644
--- a/configure/CONFIG_MODULE
+++ b/configure/CONFIG_MODULE
@@ -6,6 +6,14 @@ EPICS_MODULE_TAG:=tags/v3.6.4
 E3_MODULE_VERSION:=3.6.4
 
 
+ASYN_DEP_VERSION=4.33.0
+LOKI_DEP_VERSION=1.0.0
+NDS_DEP_VERSION=2.3.3
+SIS8300DRV_DEP_VERSION=4.2.0
+SIS8300_DEP_VERSION=2.0.1
+SIS8300LLRFDRV_DEP_VERSION=5.0.1
+
+
 # ONLY IF this module has the sequencer dependency. However,
 # in most case, we don't need to enable the following line,
 # the default - latest version will be used
diff --git a/m-epics-sis8300llrf b/m-epics-sis8300llrf
index e9f63dad1c0258174d25d98235376229246c7902..edad2c023d4e2c419c80519cdaedd438574d8e9d 160000
--- a/m-epics-sis8300llrf
+++ b/m-epics-sis8300llrf
@@ -1 +1 @@
-Subproject commit e9f63dad1c0258174d25d98235376229246c7902
+Subproject commit edad2c023d4e2c419c80519cdaedd438574d8e9d
diff --git a/sis8300llrf.Makefile b/sis8300llrf.Makefile
index db6c7918ade8fc80e6281f321e3d691d67efd60c..c67a463ade0ccf6c9657181f5fff7b4a5062b865 100644
--- a/sis8300llrf.Makefile
+++ b/sis8300llrf.Makefile
@@ -14,17 +14,14 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
 #
-# 
+#
 # Author  : joaopaulomartins
+#           Jeong Han Lee
 # email   : joaopaulomartins@esss.se
-# Date    : generated by 2018May03-1729-57CEST
-# version : 0.0.0 
+#           jeonghan.lee@gmail.com
+# Date    : Thursday, September 13 21:49:53 CEST 2018
+# version : 0.0.1
 #
-# template file is generated by create_e3_modules.bash with 7827f977a0890cd984387544e850b50b610d6be3
-# Please look at many other _module_.Makefile in e3-* repository
-# 
-
-
 #where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 include $(E3_REQUIRE_TOOLS)/driver.makefile
@@ -57,6 +54,79 @@ endif
 
 EXCLUDE_ARCHS += linux-ppc64e6500 
 
+# *** ISSUES
+# driver.makefile recursively read all include directories which were installed.
+# The only way to exclude header files is....
+
+iocStats_VERSION=
+autosave_VERSION=
+#asyn_VERSION=
+busy_VERSION=
+modbus_VERSION=
+ipmiComm_VERSION=
+sequencer_VERSION=
+sscan_VERSION=
+
+std_VERSION=
+ip_VERSION=
+calc_VERSION=
+pcre_VERSION=
+stream_VERSION=
+s7plc_VERSION=
+recsync_VERSION=
+
+devlib2_VERSION=
+mrfioc2_VERSION=
+
+exprtk_VERSION=
+motor_VERSION=
+ecmc_VERSION=
+ethercatmc_VERSION=
+ecmctraining_VERSION=
+
+
+keypress_VERSION=
+sysfs_VERSION=
+symbolname_VERSION=
+memDisplay_VERSION=
+regdev_VERSION=
+i2cDev_VERSION=
+
+tosca_VERSION=
+tsclib_VERSION=
+ifcdaqdrv2_VERSION=
+
+## The main issue is nds3, it is mandatory to disable it
+## 
+nds3_VERSION=
+nds3epics_VERSION=
+ifc14edrv_VERSION=
+ifcfastint_VERSION=
+
+
+#nds_VERSION=
+#loki_VERSION=
+#sis8300drv_VERSION=
+#sis8300_VERSION=
+#sis8300llrfdrv_VERSION=
+#sis8300llrf_VERSION=
+
+
+ADSupport_VERSION=
+ADCore_VERSION=
+ADSimDetector_VERSION=
+ADAndor_VERSION=
+ADAndor3_VERSION=
+ADPointGrey_VERSION=
+ADProsilica_VERSION=
+
+amcpico8_VERSION=
+adpico8_VERSION=
+adsis8300_VERSION=
+adsis8300bcm_VERSION=
+adsis8300bpm_VERSION=
+adsis8300fc_VERSION=
+
 
 
 APP:=.