diff --git a/build-codeblocks-project.sh b/build-codeblocks-project.sh
index 6370b0c5..5315a7a9 100755
--- a/build-codeblocks-project.sh
+++ b/build-codeblocks-project.sh
@@ -11,7 +11,7 @@ cd codeblocks
 if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
 
 LANG=C
-NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
+NUMCORES=`nproc`
 
 # This is for regular developers and used by our installer
 cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
diff --git a/build-eclipse-project.sh b/build-eclipse-project.sh
index 4db80d7d..af873026 100755
--- a/build-eclipse-project.sh
+++ b/build-eclipse-project.sh
@@ -11,7 +11,7 @@ cd eclipse
 if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
 
 LANG=C
-NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
+NUMCORES=`nproc`
 
 # This is for regular developers and used by our installer
 cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
diff --git a/build-mg-win32.sh b/build-mg-win32.sh
index 80aa819b..e8c3a284 100755
--- a/build-mg-win32.sh
+++ b/build-mg-win32.sh
@@ -5,7 +5,7 @@
 # Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
 
-NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
+NUMCORES=`nproc`
 
 #PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
 mkdir -p build-win32
diff --git a/build-mg.sh b/build-mg.sh
index 67f4e41f..85fa84c8 100755
--- a/build-mg.sh
+++ b/build-mg.sh
@@ -5,7 +5,7 @@
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
 LANG=C
-NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
+NUMCORES=`nproc`
 
 mkdir -p build
 cd build
diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index 78a72491..1575bc0f 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -119,8 +119,7 @@ CXX=/usr/bin/g++
 
 OSTYPE=`uname -s`
 if [ "$OSTYPE" = "Linux" ]; then
-    NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
-    let NCPU=$NCPU+1
+    NCPU=`nproc`
 elif [ "$OSTYPE" = "Darwin" ]; then
     NCPU=`sysctl -n hw.ncpu`
 elif [ "$OSTYPE" = "SunOS" ]; then
diff --git a/source/tools/support/linux/system_report b/source/tools/support/linux/system_report
index 3ef96ebd..b8308297 100755
--- a/source/tools/support/linux/system_report
+++ b/source/tools/support/linux/system_report
@@ -29,7 +29,7 @@
 #
 
 LANG=C
-VERSION='0.3.3'
+VERSION='0.3.4'
 MYNAME=`basename $0`
 DEFAULT_REPORT_FILENAME=system_report.log
 
@@ -284,8 +284,8 @@ echo '' >> $REPORT_LOCATION
 echo '' >> $REPORT_LOCATION
 echo '***** CPU **********************************************************************' >> $REPORT_LOCATION
 echo '' >> $REPORT_LOCATION
-echo '>>> cat /proc/cpuinfo | awk -F : '"'"'/^model name/ { print $2 }' >> $REPORT_LOCATION
-cat /proc/cpuinfo | awk -F : '/^model name/ { print $2 }' >> $REPORT_LOCATION
+echo '>>> cat /proc/cpuinfo' >> $REPORT_LOCATION
+cat /proc/cpuinfo >> $REPORT_LOCATION
 sleep 1
 
 echo ' →  Memory'