diff --git a/modules/FreeCAD.php b/modules/FreeCAD.php
new file mode 100644
index 0000000..8cc52bd
--- /dev/null
+++ b/modules/FreeCAD.php
@@ -0,0 +1,14 @@
+<?php
+
+class FreeCAD extends PatchBase {
+	function __construct() {
+		parent::__construct('FreeCAD Team', 'FreeCAD', 'https://www.freecadweb.org/downloads.php');
+	}
+	function check() : bool {
+		if ($this->fetch('https://api.github.com/repos/FreeCAD/FreeCAD/releases/latest', true))
+			return $this->parse_json('tag_name');
+		return false;
+	}
+}
+
+?>
diff --git a/modules/KiCad.php b/modules/KiCad.php
new file mode 100644
index 0000000..da2ecae
--- /dev/null
+++ b/modules/KiCad.php
@@ -0,0 +1,14 @@
+<?php
+
+class KiCad extends PatchBase {
+	function __construct() {
+		parent::__construct('KiCad Developers', 'KiCad', 'https://kicad-pcb.org/download/');
+	}
+	function check() : bool {
+		if ($this->fetch('https://kicad-pcb.org/download/source/'))
+			return $this->parse('/<p>Current Version: <strong>([\d\.]+)<\/strong><\/p>/');
+		return false;
+	}
+}
+
+?>