diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e..27b63ea8a5 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,36 +1,34 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.6
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
  -DKICAD_SCRIPTING_ACTION_MENU=ON  -DBUILD_GITHUB_PLUGIN=ON -DKICAD_USE_OCE=OFF
- -DKICAD_USE_OCC=ON -DKICAD_SPICE=$(vopt_if spice ON OFF)"
-hostmakedepends="pkg-config swig wxWidgets-gtk3-devel"
-makedepends="wxWidgets-gtk3-devel wxPython-devel python-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm occt-devel libgomp-devel
- $(vopt_if spice ngspice-devel)"
-depends="wxPython"
+ -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
+hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
+makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
+ libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
+depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
 checksum=ac1a15e25a7ff0aca4b6224bdb2d3298081b43bedfad79470339d53d5e72beb0
-build_options="spice"
-build_options_default="spice"
+python_version=3
 
-CXXFLAGS="-std=c++17"
+build_options="spice occt"
+build_options_default="spice occt"
+desc_option_spice="Enable support for SPICE simulation"
+desc_option_occt="Enable support for 3D STEP models"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python wxPython"
-	configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/${py2_sitelib}
-	 -DPYTHON_DEST=/${py2_sitelib}"
+	hostmakedepends+=" wxPython4"
+	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
+	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
 fi
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		CXXFLAGS+=" $(wx-config --cxxflags)"
-	fi
-}
diff --git a/srcpkgs/kicad/update b/srcpkgs/kicad/update
new file mode 100644
index 0000000000..2060b2060c
--- /dev/null
+++ b/srcpkgs/kicad/update
@@ -0,0 +1,2 @@
+site="https://gitlab.com/kicad/code/kicad/-/tags"
+ignore="*99*"