diff --git a/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk b/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
index 629e8d3..2b3bd48 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
+++ b/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
@@ -8,6 +8,8 @@
 	include/mfc_interface.h \
 	include/SsbSipMfcApi.h
 
+LOCAL_MODULE := libsecmfcapi
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
@@ -33,10 +35,81 @@
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := liblog
 
-ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_MODULE := libsecmfcdecapi
-include $(BUILD_SHARED_LIBRARY)
-else
-LOCAL_MODULE := libsecmfcapi
 include $(BUILD_STATIC_LIBRARY)
+
+# Shared MFC Dec API
+
+include $(CLEAR_VARS)
+
+LOCAL_COPY_HEADERS_TO := libsecmm
+LOCAL_COPY_HEADERS := \
+	include/mfc_errno.h \
+	include/mfc_interface.h \
+	include/SsbSipMfcApi.h
+
+LOCAL_MODULE := libsecmfcdecapi
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+	dec/src/SsbSipMfcDecAPI.c
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/include/
+
+LOCAL_PRELINK_MODULE := false
+
+ifeq ($(BOARD_USES_MFC_FPS),true)
+LOCAL_CFLAGS := -DCONFIG_MFC_FPS
+#LOCAL_CFLAGS += -DCONFIG_MFC_PERF_LOG
 endif
+
+ifeq ($(BOARD_USE_S3D_SUPPORT), true)
+LOCAL_CFLAGS += -DS3D_SUPPORT
+endif
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_STATIC_LIBRARIES :=
+LOCAL_SHARED_LIBRARIES := liblog
+
+include $(BUILD_SHARED_LIBRARY)
+
+# Shared MFC Enc API
+
+include $(CLEAR_VARS)
+
+LOCAL_COPY_HEADERS_TO := libsecmm
+LOCAL_COPY_HEADERS := \
+	include/mfc_errno.h \
+	include/mfc_interface.h \
+	include/SsbSipMfcApi.h
+
+LOCAL_MODULE := libsecmfcencapi
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+	enc/src/SsbSipMfcEncAPI.c
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/include/
+
+LOCAL_PRELINK_MODULE := false
+
+ifeq ($(BOARD_USES_MFC_FPS),true)
+LOCAL_CFLAGS := -DCONFIG_MFC_FPS
+#LOCAL_CFLAGS += -DCONFIG_MFC_PERF_LOG
+endif
+
+ifeq ($(BOARD_USE_S3D_SUPPORT), true)
+LOCAL_CFLAGS += -DS3D_SUPPORT
+endif
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_STATIC_LIBRARIES :=
+LOCAL_SHARED_LIBRARIES := liblog
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
index f491d60..55d65a7 100644
--- a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
@@ -40,7 +40,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif
diff --git a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
index 3ea203f..9c3d412 100644
--- a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
@@ -34,7 +34,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
index 7ca0477..0b30f8c 100644
--- a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
@@ -34,7 +34,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
index 734284f..9cb85a1 100644
--- a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
@@ -29,7 +29,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif
diff --git a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
index e9ebb60..fa57052 100644
--- a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
@@ -29,7 +29,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif
diff --git a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
index ed140d1..d14f61a 100644
--- a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
@@ -29,7 +29,7 @@
 	libSEC_OMX_Resourcemanager
 
 ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
 else
 LOCAL_STATIC_LIBRARIES += libsecmfcapi
 endif