diff --git a/agents/meshagent_pi b/agents/meshagent_pi
new file mode 100644
index 00000000..8843cc13
Binary files /dev/null and b/agents/meshagent_pi differ
diff --git a/agents/meshinstall-linux.sh b/agents/meshinstall-linux.sh
index 4b19440a..068492e0 100644
--- a/agents/meshinstall-linux.sh
+++ b/agents/meshinstall-linux.sh
@@ -46,9 +46,9 @@ CheckInstallAgent() {
 #       Linux x86, 32 bit
         machineid=5
       fi
-      if [ $machinetype == 'armv7l' ]
+      if [ $machinetype == 'armv6l' ] || [ $machinetype == 'armv7l' ]
       then
-#       Raspberry Pi 2 or Raspberry Pi 3
+#       RaspberryPi 1 (armv6l) or RaspberryPi 2/3 (armv7l)
         machineid=25
       fi
 # TODO: Add more machine types, detect KVM support, etc.
diff --git a/meshcentral.js b/meshcentral.js
index f90c7e3f..92b6ff0a 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -594,7 +594,7 @@ function CreateMeshCentralServer() {
         22: { id: 22, localname: 'MeshAgent-WinMinCore-Service-x86-64.exe', rname: 'MeshAgent.exe', desc: 'Windows MinCore Service x86-32', update: true },
         23: { id: 23, localname: 'MeshAgent-NodeJS', rname: 'meshagent', desc: 'NodeJS', update: false }, // Get this one from NPM
         24: { id: 24, localname: 'meshagent_arm-linaro', rname: 'meshagent', desc: 'Linux ARM Linaro', update: true },
-        25: { id: 25, localname: 'meshagent_pi2', rname: 'meshagent', desc: 'Linux ARMv7 - Raspberry Pi 2/3', update: true } // armv7l
+        25: { id: 25, localname: 'meshagent_pi', rname: 'meshagent', desc: 'Linux ARM - Raspberry Pi', update: true } // "armv6l" and "armv7l"
     };
 
     // Update the list of available mesh agents
diff --git a/mesherrors.txt b/mesherrors.txt
index 001aa0f9..a86e5f7f 100644
--- a/mesherrors.txt
+++ b/mesherrors.txt
@@ -245,3 +245,9 @@ TypeError: Date.now is not a constructor
     at Immediate._onImmediate (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:498:34)

 
 
+-------- 9/7/2017, 12:15:48 PM --------
+
+Error: ENOENT: no such file or directory, stat 'C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\agents\meshagent_pi2'
+    at Error (native)
+
+
diff --git a/package.json b/package.json
index c01763b6..7e481632 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.0.7-n",
+  "version": "0.0.7-o",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index 38313c26..2ed6ac5d 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2372,7 +2372,7 @@
                 }
 
                 // Attribute: Mesh Agent
-                var agentsStr = ['Unknown', 'Windows 32bit console', 'Windows 64bit console', 'Windows 32bit service', 'Windows 64bit service', 'Linux 32bit', 'Linux 64bit', 'MIPS', 'XENx86', 'Android ARM', 'Linux ARM', 'OSX 32bit', 'Android x86', 'PogoPlug ARM', 'Android APK', 'Linux Poky x86-32bit', 'OSX 64bit', 'ChromeOS', 'Linux Poky x86-64bit', 'Linux NoKVM x86-32bit', 'Linux NoKVM x86-64bit', 'Windows MinCore console', 'Windows MinCore service', 'NodeJS' ];
+                var agentsStr = ['Unknown', 'Windows 32bit console', 'Windows 64bit console', 'Windows 32bit service', 'Windows 64bit service', 'Linux 32bit', 'Linux 64bit', 'MIPS', 'XENx86', 'Android ARM', 'Linux ARM', 'OSX 32bit', 'Android x86', 'PogoPlug ARM', 'Android APK', 'Linux Poky x86-32bit', 'OSX 64bit', 'ChromeOS', 'Linux Poky x86-64bit', 'Linux NoKVM x86-32bit', 'Linux NoKVM x86-64bit', 'Windows MinCore console', 'Windows MinCore service', 'NodeJS', 'ARM-Linaro', 'ARMv6l / ARMv7l' ];
                 if ((node.agent != undefined) && (node.agent.id != undefined) && (node.agent.ver != undefined)) {
                     var str = '';
                     if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; }