diff --git a/data/scons/qt5.py b/data/scons/qt5.py
index 3c5b85dc9..c054cad26 100644
--- a/data/scons/qt5.py
+++ b/data/scons/qt5.py
@@ -456,7 +456,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
                         self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
                         self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5")])
                         self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5",module)])
-                pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ]
+                pcmodules = [module.replace('Qt','Qt5')+debugSuffix for module in modules if module not in pclessModules ]
                 if 'QtDBus' in pcmodules:
                         self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5","QtDBus")])
                 if "QtAssistant" in pcmodules:
diff --git a/src/libcore/thread.cpp b/src/libcore/thread.cpp
index dca266b91..96659e5eb 100644
--- a/src/libcore/thread.cpp
+++ b/src/libcore/thread.cpp
@@ -633,7 +633,9 @@ void Thread::initializeOpenMP(size_t threadCount) {
             }
             const std::string threadName = "Mitsuba: " + thread->getName();
 
-            #if defined(__LINUX__) || defined(__OSX__)
+            #if defined(__LINUX__)
+	        pthread_setname_np(pthread_self(), threadName.c_str());
+            #elif defined(__OSX__)
                 pthread_setname_np(threadName.c_str());
             #elif defined(__WINDOWS__)
                 SetThreadName(threadName.c_str());