diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index 1932a28134a..da122efc34f 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -91,7 +91,8 @@ def fix_rpaths_helper(chrpath_bin, install_dir, dirpath, filenames):
     for filename in filenames:
         fpath = os.path.join(dirpath, filename)
         relpath = os.path.relpath(install_dir+'/lib/qtcreator', dirpath)
-        command = [chrpath_bin, '-r', '$ORIGIN/'+relpath, fpath]
+        relpluginpath = os.path.relpath(install_dir+'/lib/qtcreator/plugins', dirpath)
+        command = [chrpath_bin, '-r', '$ORIGIN/'+relpath+':$ORIGIN/'+relpluginpath, fpath]
         print fpath, ':', command
         try:
             subprocess.check_call(command)
diff --git a/src/plugins/cpaster/frontend/frontend.pro b/src/plugins/cpaster/frontend/frontend.pro
index ea810e3a607..4f0f39b45cc 100644
--- a/src/plugins/cpaster/frontend/frontend.pro
+++ b/src/plugins/cpaster/frontend/frontend.pro
@@ -1,4 +1,3 @@
-TEMPLATE = app
 TARGET=cpaster
 
 QTC_LIB_DEPENDS += \
@@ -7,16 +6,11 @@ QTC_LIB_DEPENDS += \
 QTC_PLUGIN_DEPENDS += \
     coreplugin
 
-include(../../../../qtcreator.pri)
-include(../../../rpath.pri)
+include(../../../qtcreatortool.pri)
 
-CONFIG += console
-CONFIG -= app_bundle
 QT += network
 
-QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH
-
-DESTDIR=$$IDE_LIBEXEC_PATH
+linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$$relative_path($$IDE_PLUGIN_PATH, $$DESTDIR)\'
 
 HEADERS = ../protocol.h \
     ../cpasterconstants.h \