diff --git a/setup.py b/setup.py
index 7fff74ec..49dda60e 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ def params():
 		"": "src"
 	}
 	package_data = {
-		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations'])
+		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations', 'grbl'])
 	}
 
 	include_package_data = True
diff --git a/grbl.hex b/src/octoprint/grbl/grbl.hex
similarity index 100%
rename from grbl.hex
rename to src/octoprint/grbl/grbl.hex
diff --git a/src/octoprint/util/grblVersionRequirement.yml b/src/octoprint/grbl/grblVersionRequirement.yml
similarity index 100%
rename from src/octoprint/util/grblVersionRequirement.yml
rename to src/octoprint/grbl/grblVersionRequirement.yml
diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py
index 4e07cdfa..f9e1b1cc 100644
--- a/src/octoprint/util/comm_acc.py
+++ b/src/octoprint/util/comm_acc.py
@@ -1006,7 +1006,7 @@ class MachineCom(object):
 						eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
 
 					if("Grbl" in line):
-						versionMatch = re.search("Grbl (?P<grbl>.+)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
+						versionMatch = re.search("Grbl (?P<grbl>.+?)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
 						if(versionMatch):
 							versionDict = versionMatch.groupdict()
 							self._writeGrblVersionToFile(versionDict)