diff --git a/python/plugins/GdalTools/CMakeLists.txt b/python/plugins/GdalTools/CMakeLists.txt
index 628a7ee849f..2ef87e7b26e 100644
--- a/python/plugins/GdalTools/CMakeLists.txt
+++ b/python/plugins/GdalTools/CMakeLists.txt
@@ -4,11 +4,12 @@ SET(INSTALLER_FILES ${INSTALLER_FILES})
 FILE(GLOB UI_FILES *.ui)
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
 PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
-ADD_CUSTOM_TARGET(gdaltools ALL DEPENDS ${PYUI_FILES} ${PYRC_FILES})
+#ADD_CUSTOM_TARGET(gdaltools ALL DEPENDS ${PYUI_FILES} ${PYRC_FILES})
 
 SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})
 
-INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools)
+#INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools)
+PLUGIN_INSTALL(GdalTools . ${INSTALLER_FILES} __init__.pyc)
 
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(icons)
diff --git a/python/plugins/GdalTools/icons/CMakeLists.txt b/python/plugins/GdalTools/icons/CMakeLists.txt
index 4d01713673c..e4b3dae446e 100644
--- a/python/plugins/GdalTools/icons/CMakeLists.txt
+++ b/python/plugins/GdalTools/icons/CMakeLists.txt
@@ -1,2 +1,2 @@
 FILE(GLOB ICON_FILES *.png)
-INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools/icons)
+PLUGIN_INSTALL(GdalTools icons ${ICON_FILES})
diff --git a/python/plugins/GdalTools/tools/CMakeLists.txt b/python/plugins/GdalTools/tools/CMakeLists.txt
index d1d65e7a00b..6f714b05821 100644
--- a/python/plugins/GdalTools/tools/CMakeLists.txt
+++ b/python/plugins/GdalTools/tools/CMakeLists.txt
@@ -4,8 +4,5 @@ FILE(GLOB COLOR_CONFIG_FILES terrain.txt)
 
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
 
-ADD_CUSTOM_TARGET(gdaltools_tools ALL DEPENDS ${PYUI_FILES})
+PLUGIN_INSTALL(GdalTools tools ${PY_FILES} ${PYUI_FILES} ${COLOR_CONFIG_FILES})
 
-INSTALL(FILES ${PY_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools/tools)
-INSTALL(FILES ${PYUI_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools/tools)
-INSTALL(FILES ${COLOR_CONFIG_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools/tools)