diff --git a/android/AndroidCVModule.cmake b/android/AndroidCVModule.cmake
index d08de7c40..c7a5de070 100644
--- a/android/AndroidCVModule.cmake
+++ b/android/AndroidCVModule.cmake
@@ -19,7 +19,7 @@ endmacro()
 macro(define_opencv_module name)
 	file(GLOB lib_srcs "src/*.cpp")
 	file(GLOB lib_int_hdrs "src/*.h*")
-	define_android_manual(${name} "${lib_srcs}" "$(LOCAL_PATH)/src  $(OPENCV_INCLUDES)")
+	define_android_manual(opencv_${name} "${lib_srcs}" "$(LOCAL_PATH)/src  $(OPENCV_INCLUDES)")
 endmacro()
 
 
diff --git a/android/Application.mk.in b/android/Application.mk.in
index b7431d550..ab8f84a3f 100644
--- a/android/Application.mk.in
+++ b/android/Application.mk.in
@@ -2,5 +2,5 @@ APP_BUILD_SCRIPT := $(call my-dir)/Android.mk
 APP_PROJECT_PATH := $(call my-dir)
 # The ARMv7 is significanly faster due to the use of the hardware FPU
 APP_ABI := armeabi armeabi-v7a
-APP_MODULES      := png jpeg jasper zlib opencv_lapack core imgproc ml highgui features2d \
-    legacy objdetect calib3d video contrib flann 
+APP_MODULES      := png jpeg jasper zlib opencv_lapack opencv_core opencv_imgproc opencv_ml opencv_highgui opencv_features2d \
+    opencv_legacy opencv_objdetect opencv_calib3d opencv_video opencv_contrib opencv_flann 
diff --git a/android/android-opencv.mk.in b/android/android-opencv.mk.in
index 44f6866d7..33ae6dcaa 100644
--- a/android/android-opencv.mk.in
+++ b/android/android-opencv.mk.in
@@ -31,8 +31,8 @@ ANDROID_OPENCV_LIB_DIRS := -L$(OPENCV_ROOT)/android/android-jni/libs/armeabi-v7a
 #order of linking very important ---- may have stuff out of order here, but
 #important that modules that are more dependent come first...
 
-OPENCV_LIBS := $(OPENCV_LIB_DIRS) -lfeatures2d  -lcalib3d -limgproc -lobjdetect  \
-     -lvideo  -lhighgui -lml -llegacy -lcore -lopencv_lapack -lflann \
+OPENCV_LIBS := $(OPENCV_LIB_DIRS) -lopencv_features2d  -lopencv_calib3d -lopencv_imgproc -lopencv_objdetect  \
+     -lopencv_video  -lopencv_highgui -lopencv_ml -lopencv_legacy -lopencv_core -lopencv_lapack -lopencv_flann \
     -lzlib -lpng -ljpeg -ljasper
 ANDROID_OPENCV_LIBS := $(ANDROID_OPENCV_LIB_DIRS) -landroid-opencv