diff --git a/libnymea/plugin/plugin.pri b/libnymea/plugin/plugin.pri
index 817a0c90..67c087d6 100644
--- a/libnymea/plugin/plugin.pri
+++ b/libnymea/plugin/plugin.pri
@@ -48,15 +48,21 @@ OTHER_FILES+=deviceplugin"$$TARGET".json
 # Create plugininfo file
 plugininfo.target = $$OUT_PWD/plugininfo.h
 plugininfo_dummy.target = plugininfo.h
+plugininfo.depends = FORCE
+plugininfo.commands = nymea-generateplugininfo --filetype i --jsonfile $${_PRO_FILE_PWD_}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD
+plugininfo_dummy.commands = $$plugininfo.commands
+QMAKE_EXTRA_TARGETS += plugininfo plugininfo_dummy
+
+# Create extern-plugininfo file
 extern_plugininfo.target = $$OUT_PWD/extern-plugininfo.h
 extern_plugininfo_dummy.target = extern-plugininfo.h
-plugininfo.depends = FORCE
-plugininfo.commands = nymea-generateplugininfo --filetype i --jsonfile $${_PRO_FILE_PWD_}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD; \
-                      nymea-generateplugininfo --filetype e --jsonfile $${_PRO_FILE_PWD_}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD
-plugininfo_dummy.commands = $$plugininfo.commands
-QMAKE_EXTRA_TARGETS += plugininfo plugininfo_dummy extern_plugininfo extern_plugininfo_dummy
+extern_plugininfo.depends = FORCE
+extern_plugininfo.commands = nymea-generateplugininfo --filetype e --jsonfile $${_PRO_FILE_PWD_}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD
+extern_plugininfo_dummy.commands = $$extern_plugininfo.commands
+QMAKE_EXTRA_TARGETS += extern_plugininfo extern_plugininfo_dummy
 
-plugininfo_clean.commands = rm -f $$OUT_PWD/plugininfo.h $$OUT_PWD/extern-plugininfo.h
+# Clean up autogenerated plugin info files
+plugininfo_clean.commands = rm -fv $$OUT_PWD/plugininfo.h $$OUT_PWD/extern-plugininfo.h
 clean.depends = plugininfo_clean
 QMAKE_EXTRA_TARGETS += clean plugininfo_clean
 
@@ -80,6 +86,8 @@ HEADERS += $$OUT_PWD/plugininfo.h \
            $$OUT_PWD/extern-plugininfo.h
 DEPENDPATH += $$OUT_PWD
 
+TARGET = $$qtLibraryTarget(nymea_deviceplugin"$$TARGET")
+
 # Install plugin
 target.path = $$[QT_INSTALL_LIBS]/nymea/plugins/
 INSTALLS += target translations