diff --git a/.gitmodules b/.gitmodules
index d12664640e6026718839da2329a6cc03499a4ee5..11ce7d34630c2506a9ef00d41f4a96ac6a06a637 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "camera/xh"]
 	path = camera/xh
 	url = git://github.com/esrf-bliss/Lima-camera-xh
+[submodule "camera/imxpad"]
+	path = camera/imxpad
+	url = git://github.com/esrf-bliss/Lima-camera-imxpad
diff --git a/applications/tango b/applications/tango
index 07952d0f4145ac969e01162547b893d9651cf258..f8ce0e620cd8573395afb2a7a81a5536a44412b7 160000
--- a/applications/tango
+++ b/applications/tango
@@ -1 +1 @@
-Subproject commit 07952d0f4145ac969e01162547b893d9651cf258
+Subproject commit f8ce0e620cd8573395afb2a7a81a5536a44412b7
diff --git a/build/Makefile b/build/Makefile
index a9596a0186afdb79ab02bdb072f919ae437c3881..17f78532fa66c9602187619c1641b2c74969b6d3 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -492,6 +492,29 @@ build_targets	+= $(call lib-full,$(pointgrey-name),$(pointgrey-ver))
 
 endif
 
+############################
+# LIMA - IMXPAD
+############################
+ifneq ($(COMPILE_IMXPAD),0)
+
+IMXPAD_LDFLAGS	:= $(LDFLAGS)
+IMXPAD_LDLIBS	:= $(LDLIBS)
+
+imxpad-name	:= imxpad
+imxpad-objs	:= ../camera/imxpad/src/imXpad.o
+imxpad-ver	:= ../camera/imxpad/VERSION
+imxpad-flags	:= $(IMXPAD_LDFLAGS)
+imxpad-deps	:= $(IMXPAD_LDLIBS)
+
+$(call lib-full,$(imxpad-name),$(imxpad-ver)): $(imxpad-objs)
+	$(call compile-lib,$(imxpad-name),$(imxpad-ver),\
+			   $(imxpad-flags),$(imxpad-deps),$@,$+)
+	$(call create-links,$(imxpad-name),$(imxpad-ver))
+
+build_targets	+= $(call lib-full,$(imxpad-name),$(imxpad-ver))
+
+endif
+
 src:		$(build_targets)
 
 test:
diff --git a/camera/Makefile b/camera/Makefile
index cac368f36749c46d71c254c32ffc566549dc39f1..462ad2595f12aa69e483d4fc2beb6579efe7a98e 100644
--- a/camera/Makefile
+++ b/camera/Makefile
@@ -140,4 +140,12 @@ ifneq ($(COMPILE_POINTGREY),0)
 sub-dirs += pointgrey
 endif
 
+ifndef COMPILE_IMXPAD
+COMPILE_IMXPAD = 0
+endif
+
+ifneq ($(COMPILE_IMXPAD),0)
+sub-dirs += imxpad
+endif
+
 include ../global.inc
diff --git a/camera/imxpad b/camera/imxpad
new file mode 160000
index 0000000000000000000000000000000000000000..c0a688f7df3cb9f96dd7693b9b0c2eaa4a99e2a2
--- /dev/null
+++ b/camera/imxpad
@@ -0,0 +1 @@
+Subproject commit c0a688f7df3cb9f96dd7693b9b0c2eaa4a99e2a2
diff --git a/config.inc_default b/config.inc_default
index 46af38ca09b5cbe93e1f52a0159c895b996ea0bb..f50123030634f51c68f2100f260f3e37a148b6fc 100644
--- a/config.inc_default
+++ b/config.inc_default
@@ -41,6 +41,7 @@ COMPILE_PHOTONICSCIENCE=0
 COMPILE_PCO=0
 COMPILE_MARCCD=0
 COMPILE_POINTGREY=0
+COMPILE_IMXPAD=0
 COMPILE_CBF_SAVING=0
 COMPILE_NXS_SAVING=0
 COMPILE_FITS_SAVING=0
@@ -52,6 +53,6 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
        COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
        COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XPAD COMPILE_PERKINELMER \
        COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD \
-       COMPILE_POINTGREY COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
+       COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
        COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_CONFIG\
        LINK_STRICT_VERSION
diff --git a/install.inc b/install.inc
index 57318477124d7be77f54da2d38e2089b8c85b112..7a115a2bd6dffb8c26a114377bc34f2227e91ae8 100644
--- a/install.inc
+++ b/install.inc
@@ -169,6 +169,12 @@ POINTGREY_FULL_VERSION = $(shell cat camera/pointgrey/VERSION)
 INSTALL_POINTGREY_VDIR = $(INSTALL_POINTGREY_DIR)/v$(POINTGREY_FULL_VERSION)
 endif
 
+ifneq ($(COMPILE_IMXPAD), 0)
+INSTALL_IMXPAD_DIR = $(INSTALL_PLAT_DIR)/imXpad
+IMXPAD_FULL_VERSION = $(shell cat camera/imxpad/VERSION)
+INSTALL_IMXPAD_VDIR = $(INSTALL_IMXPAD_DIR)/v$(IMXPAD_FULL_VERSION)
+endif
+
 ifneq ($(COMPILE_SPS_IMAGE),0)
 INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
 endif
@@ -419,3 +425,12 @@ ifneq ($(COMPILE_POINTGREY), 0)
 	cp camera/pointgrey/include/*.h $(INSTALL_INCLUDE_DIR)
 endif
 
+ifneq ($(COMPILE_IMXPAD), 0)
+	mkdir -p $(INSTALL_IMXPAD_VDIR)
+	cp camera/imxpad/python/__init__.py $(INSTALL_IMXPAD_DIR)
+	$(call install_core_dep,$(INSTALL_IMXPAD_VDIR))
+	rm -rf $(INSTALL_LIB_DIR)/liblimaimxpad.so*
+	cp -d build/liblimaimxpad.so* $(INSTALL_LIB_DIR)
+	cp sip/imxpad/limaimxpad.so $(INSTALL_IMXPAD_VDIR)
+	cp camera/imxpad/include/*.h $(INSTALL_INCLUDE_DIR)
+endif
diff --git a/sip/.gitignore b/sip/.gitignore
index 747d1292089c2eac8c3f4be1a30f116b033e5415..4ce8cbb1665b8bd1f88dc0409e9667ca9ad32334 100644
--- a/sip/.gitignore
+++ b/sip/.gitignore
@@ -31,3 +31,4 @@ lima*.lib
 *.pyd.manifest
 *.pyd
 .svn
+imxpad
diff --git a/sip/Makefile b/sip/Makefile
index 7c46747ae69fd1c6e047c57e7912301377c4bb16..a66b4687323749849821518a33f989729b2ece8f 100644
--- a/sip/Makefile
+++ b/sip/Makefile
@@ -91,6 +91,10 @@ ifneq ($(COMPILE_POINTGREY), 0)
 sip-modules += pointgrey
 endif
 
+ifneq ($(COMPILE_IMXPAD), 0)
+sip-modules += imxpad
+endif
+
 all:	src
 
 src:
diff --git a/sip/configure.py b/sip/configure.py
index 20e7dc81d4f1c2a6c1f5076a1c8c561550149809..713958f840d7b5b583ea0cba1c8edfada39d48af 100644
--- a/sip/configure.py
+++ b/sip/configure.py
@@ -47,6 +47,7 @@ modules = [('core',		['common', 'hardware', 'control']),
            ('photonicscience',  [os.path.join('camera','photonicscience')]),
            ('pilatus',          [os.path.join('camera','pilatus')]),
            ('pointgrey',        [os.path.join('camera','pointgrey')]),
+           ('imxpad',           [os.path.join('camera','imxpad')]),
            ]
 
 espiaModules = ['espia', 'frelon', 'maxipix']