diff --git a/python/plugins/fTools/CMakeLists.txt b/python/plugins/fTools/CMakeLists.txt
@@ -1,14 +1,11 @@
 FILE(GLOB INSTALLER_FILES *.py)
-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(ftools 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/fTools)
+PLUGIN_INSTALL(fTools . ${INSTALLER_FILES} __init__.py)
 
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(icons)

diff --git a/python/plugins/fTools/__init__.py b/python/plugins/fTools/__init__.py
@@ -50,5 +50,5 @@ def authorName():
   return "Carson J. Q. Farmer"
 
 def classFactory( iface ):
-  from fTools import fToolsPlugin
+  from .fTools import fToolsPlugin
   return fToolsPlugin( iface )
diff --git a/python/plugins/fTools/icons/CMakeLists.txt b/python/plugins/fTools/icons/CMakeLists.txt
@@ -5,7 +5,8 @@ gis-0.1.svg
 logo.svg
 menu_icons.svg
 )
-INSTALL(FILES ${VECTOR_GRAPHICS_FILES} logo_small.png DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons)
+
+PLUGIN_INSTALL(fTools icons ${VECTOR_GRAPHICS_FILES} logo_small.png)
 
 ADD_SUBDIRECTORY(default)
 ADD_SUBDIRECTORY(gis)
diff --git a/python/plugins/fTools/icons/default/CMakeLists.txt b/python/plugins/fTools/icons/default/CMakeLists.txt
@@ -47,4 +47,5 @@ delaunay.png
 layer_extent.png
 merge_shapes.png
 )
-INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons/default)
+
+PLUGIN_INSTALL(fTools icons/default ${ICON_FILES})
diff --git a/python/plugins/fTools/icons/gis/CMakeLists.txt b/python/plugins/fTools/icons/gis/CMakeLists.txt
@@ -1,2 +1,3 @@
 FILE(GLOB ICON_FILES *.png)
-INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons/gis)
+
+PLUGIN_INSTALL(fTools icons/gis ${ICON_FILES})
diff --git a/python/plugins/fTools/tools/CMakeLists.txt b/python/plugins/fTools/tools/CMakeLists.txt
@@ -3,7 +3,4 @@ FILE(GLOB UI_FILES *.ui)
 
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
 
-ADD_CUSTOM_TARGET(ftools_tools ALL DEPENDS ${PYUI_FILES})
-
-INSTALL(FILES ${PY_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/tools)
-INSTALL(FILES ${PYUI_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/tools)
+PLUGIN_INSTALL(fTools tools ${PY_FILES} ${PYUI_FILES})
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -120,7 +120,6 @@ void QgsApplication::init( QString customConfigPath )
 #else
     setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) );
 #endif
-    setPkgDataPath( ABISYM( mBuildSourcePath ) ); // directly source path - used for: doc, resources, svg
     ABISYM( mLibraryPath ) = ABISYM( mBuildOutputPath ) + "/" + QGIS_LIB_SUBDIR + "/";
     ABISYM( mLibexecPath ) = ABISYM( mBuildOutputPath ) + "/" + QGIS_LIBEXEC_SUBDIR + "/";
   }