diff --git a/dev-qt/wxqt/wxqt-3.1.1~git.recipe b/dev-qt/wxqt/wxqt-3.1.1.recipe
similarity index 51%
rename from dev-qt/wxqt/wxqt-3.1.1~git.recipe
rename to dev-qt/wxqt/wxqt-3.1.1.recipe
index de4c99a0e..343ca93c6 100644
--- a/dev-qt/wxqt/wxqt-3.1.1~git.recipe
+++ b/dev-qt/wxqt/wxqt-3.1.1.recipe
@@ -6,41 +6,50 @@ other languages, and unlike other cross-platform toolkits, wxWidgets gives \
 applications a truly native look and feel because it uses the platform's \
 native API rather than emulating the GUI. It's also extensive, free, \
 open-source and mature."
-HOMEPAGE="https://www.wxwidgets.org"
-COPYRIGHT="1998-2016 Julian Smart, Robert Roebling et al"
+HOMEPAGE="https://www.wxwidgets.org/"
+COPYRIGHT="1998-2018 Julian Smart, Robert Roebling et al"
 LICENSE="GNU LGPL v2"
-REVISION="3"
-SOURCE_URI="https://github.com/seandepagnier/wxWidgets/archive/0a0e2e119690637af73da4535.tar.gz"
-CHECKSUM_SHA256="3bd4d299ea75e8f86756b144a507760464ec99d44e59abf4d088e156eb3d3d99"
-SOURCE_DIR="wxWidgets-0a0e2e119690637af73da4535eef51be74101b94"
+REVISION="1"
+SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e"
+SOURCE_DIR="wxWidgets-$portVersion"
 PATCHES="wxwidgets-sckaddr.patch"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+libSoVersion="1.0.0"
+
 PROVIDES="
 	wxqt$secondaryArchSuffix = $portVersion
-	lib:libwx_baseu_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_baseu_net_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_baseu_xml_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_adv_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_aui_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_core_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_html_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_media_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_qa_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_richtext_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_stc_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libwx_qtu_xrc_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
+	lib:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_adv_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_aui_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_core_3.1$secondaryArchSuffix = $libVersionCompat
+#	lib:libwx_qtu_gl_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_html_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_media_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_qa_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_richtext_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_stc_3.1$secondaryArchSuffix = $libVersionCompat
+	lib:libwx_qtu_xrc_3.1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-#	lib:libcairo$secondaryArchSuffix
+	lib:libcairo$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
+#	lib:libGL$secondaryArchSuffix
+#	lib:libGLU$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -54,31 +63,33 @@ PROVIDES_devel="
 	wxqt${secondaryArchSuffix}_devel = $portVersion
 	cmd:wx_config$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:wxrc$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:wxrc_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_baseu_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_baseu_net_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_baseu_xml_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_adv_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_aui_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_core_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_html_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_media_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_qa_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_richtext_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_stc_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
-	devel:libwx_qtu_xrc_3.1$secondaryArchSuffix = $portVersion compat >= 3.1
+	cmd:wxrc_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_adv_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_aui_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_core_3.1$secondaryArchSuffix = $libVersionCompat
+#	devel:libwx_qtu_gl_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_html_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_media_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_qa_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_richtext_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_stc_3.1$secondaryArchSuffix = $libVersionCompat
+	devel:libwx_qtu_xrc_3.1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	wxqt$secondaryArchSuffix == $portVersion base
-#	devel:libcairo$secondaryArchSuffix
+	devel:libcairo$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -86,10 +97,14 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-#	devel:libcairo$secondaryArchSuffix
+	devel:libcairo$secondaryArchSuffix
+	devel:libexecinfo$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
+#	devel:libGL$secondaryArchSuffix
+#	devel:libGLU$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
@@ -108,6 +123,23 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage wxqt$secondaryArchSuffix \
+	"$libDir"/libwx_baseu-3.1.so.$libSoVersion \
+	"$libDir"/libwx_baseu_net-3.1.so.$libSoVersion \
+	"$libDir"/libwx_baseu_xml-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_adv-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_aui-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_core-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_html-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_media-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_propgrid-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_qa-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_ribbon-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_richtext-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_stc-3.1.so.$libSoVersion \
+	"$libDir"/libwx_qtu_xrc-3.1.so.$libSoVersion
+#	"$libDir"/libwx_qtu_gl-3.1.so.$libSoVersion
+
 PATCH()
 {
 	# autoconf chokes for whatever reason while trying to reconfigure,
@@ -120,7 +152,7 @@ PATCH()
 
 BUILD()
 {
-	export CXXFLAGS="-std=c++11"
+	export CXXFLAGS="-std=c++11 -fpermissive"
 
 	runConfigure ./configure \
 		--with-qt \
@@ -151,6 +183,7 @@ INSTALL()
 		libwx_qtu_richtext-3.1 \
 		libwx_qtu_stc-3.1 \
 		libwx_qtu_xrc-3.1
+#		libwx_qtu_gl-3.1
 
 	# Install some missing headers that the build system didn't install.
 	cp  include/wx/generic/caret.h \