diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb
index ac89c1294..45f895819 100644
--- a/packages/wxwidgets.rb
+++ b/packages/wxwidgets.rb
@@ -3,11 +3,11 @@ require 'buildsystems/autotools'
 class Wxwidgets < Autotools
   description 'wxWidgets is a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base.'
   homepage 'https://www.wxwidgets.org/'
-  version '3.2.6'
+  version '3.2.6-1'
   license 'GPL-2'
   compatibility 'aarch64 armv7l x86_64'
   source_url 'https://github.com/wxWidgets/wxWidgets.git'
-  git_hashtag "v#{version}"
+  git_hashtag "v#{version.split('-')[0]}"
   binary_compression 'tar.zst'
 
   binary_sha256({
@@ -68,20 +68,19 @@ class Wxwidgets < Autotools
   end
 
   configure_options '--with-gtk=3 \
-      --with-opengl \
-      --enable-unicode \
-      --enable-graphics_ctx \
-      --enable-mediactrl \
-      --enable-webview \
-      --with-regex=builtin \
-      --with-libpng=builtin \
-      --with-libjpeg=sys \
-      --with-libtiff=sys \
-      --without-gnomevfs \
-      --disable-precomp-headers'
+    --with-opengl \
+    --enable-unicode \
+    --enable-graphics_ctx \
+    --enable-mediactrl \
+    --enable-webview \
+    --with-regex=builtin \
+    --with-libpng=builtin \
+    --with-libjpeg=sys \
+    --with-libtiff=sys \
+    --without-gnomevfs \
+    --disable-precomp-headers'
 
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  configure_install_extras do
     Dir.chdir "#{CREW_DEST_PREFIX}/bin" do
       FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.2", 'wx-config'
     end
diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb
index 519ec38f5..febf68f0c 100644
--- a/packages/wxwidgets30.rb
+++ b/packages/wxwidgets30.rb
@@ -1,14 +1,13 @@
-require 'package'
+require 'buildsystems/autotools'
 
-class Wxwidgets30 < Package
+class Wxwidgets30 < Autotools
   description 'wxWidgets is a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base.'
   homepage 'https://www.wxwidgets.org/'
-  @_ver = '3.0.5.1'
-  version "#{@_ver}-2"
+  version '3.0.5.1-3'
   license 'GPL-2'
   compatibility 'aarch64 armv7l x86_64'
   source_url 'https://github.com/wxWidgets/wxWidgets.git'
-  git_hashtag "v#{@_ver}"
+  git_hashtag "v#{version.split('-')[0]}"
   binary_compression 'tar.zst'
 
   binary_sha256({
@@ -53,26 +52,21 @@ class Wxwidgets30 < Package
     end
   end
 
-  def self.build
-    system "./configure #{CREW_CONFIGURE_OPTIONS} \
-      --with-gtk=3 \
-      --with-opengl \
-      --enable-unicode \
-      --enable-graphics_ctx \
-      --enable-mediactrl \
-      --enable-webview \
-      --with-regex=builtin \
-      --with-libpng=builtin \
-      --with-libjpeg=sys \
-      --with-libtiff=sys \
-      --without-gnomevfs \
-      --disable-universal \
-      --disable-precomp-headers"
-    system 'make'
-  end
+  configure_options '--with-gtk=3 \
+    --with-opengl \
+    --enable-unicode \
+    --enable-graphics_ctx \
+    --enable-mediactrl \
+    --enable-webview \
+    --with-regex=builtin \
+    --with-libpng=builtin \
+    --with-libjpeg=sys \
+    --with-libtiff=sys \
+    --without-gnomevfs \
+    --disable-universal \
+    --disable-precomp-headers'
 
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  configure_install_extras do
     Dir.chdir "#{CREW_DEST_PREFIX}/bin" do
       FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.0", 'wx-config'
     end
diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb
index d837029b1..c1a07f69e 100644
--- a/packages/wxwidgets31.rb
+++ b/packages/wxwidgets31.rb
@@ -1,14 +1,13 @@
-require 'package'
+require 'buildsystems/autotools'
 
-class Wxwidgets31 < Package
+class Wxwidgets31 < Autotools
   description 'wxWidgets is a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base.'
   homepage 'https://www.wxwidgets.org/'
-  @_ver = '3.1.7'
-  version "#{@_ver}-2"
+  version '3.1.7-3'
   license 'wxWindows Library Licence'
   compatibility 'aarch64 armv7l x86_64'
   source_url 'https://github.com/wxWidgets/wxWidgets.git'
-  git_hashtag "v#{@_ver}"
+  git_hashtag "v#{version.split('-')[0]}"
   binary_compression 'tar.zst'
 
   binary_sha256({
@@ -64,25 +63,20 @@ class Wxwidgets31 < Package
     end
   end
 
-  def self.build
-    system "./configure #{CREW_CONFIGURE_OPTIONS} \
-      --with-gtk=3 \
-      --with-opengl \
-      --enable-unicode \
-      --enable-graphics_ctx \
-      --enable-mediactrl \
-      --enable-webview \
-      --with-regex=builtin \
-      --with-libpng=builtin \
-      --with-libjpeg=sys \
-      --with-libtiff=sys \
-      --without-gnomevfs \
-      --disable-precomp-headers"
-    system 'make'
-  end
+  configure_options '--with-gtk=3 \
+    --with-opengl \
+    --enable-unicode \
+    --enable-graphics_ctx \
+    --enable-mediactrl \
+    --enable-webview \
+    --with-regex=builtin \
+    --with-libpng=builtin \
+    --with-libjpeg=sys \
+    --with-libtiff=sys \
+    --without-gnomevfs \
+    --disable-precomp-headers'
 
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  configure_install_extras do
     Dir.chdir "#{CREW_DEST_PREFIX}/bin" do
       FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.1", 'wx-config'
     end