diff --git a/net-im/vacuum/vacuum-1.2.5.recipe b/net-im/vacuum/vacuum-1.2.5.recipe
index 9fdcc1346..d139a7e65 100644
--- a/net-im/vacuum/vacuum-1.2.5.recipe
+++ b/net-im/vacuum/vacuum-1.2.5.recipe
@@ -1,17 +1,16 @@
 SUMMARY="Crossplatform Jabber/XMPP client"
 DESCRIPTION="Vacuum IM is a free/libre cross-platform Qt4-based Jabber client."
 HOMEPAGE="http://www.vacuum-im.org"
+COPYRIGHT="2008-2015 Vacuum Team"
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="https://github.com/Vacuum-IM/vacuum-im/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da"
 SOURCE_FILENAME="vacuum-im-$portVersion.tar.gz"
 SOURCE_DIR="vacuum-im-$portVersion"
-CHECKSUM_SHA256="3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da"
 ADDITIONAL_FILES="vacuum.rdef"
-REVISION="1"
-LICENSE="GNU GPL v3"
-COPYRIGHT="2008-2015 Vacuum Team"
 
 ARCHITECTURES="!x86_gcc2 x86"
-
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -23,16 +22,18 @@ REQUIRES="
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libz$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
-	cmd:g++${secondaryArchSuffix}
-	cmd:cmake
-	cmd:make
-	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	devel:libz${secondaryArchSuffix}
 	"
+BUILD_PREREQUIRES="
+	cmd:g++${secondaryArchSuffix}
+	cmd:cmake
+	cmd:make
+	"
+
 PATCH()
 {
 	sed -i 's/#ifdef __FreeBSD__/#if defined(__FreeBSD__) || defined(__HAIKU__)/g' \
diff --git a/net-im/vacuum/vacuum-1.3.0.20180105.recipe b/net-im/vacuum/vacuum-1.3.0.20180105.recipe
index a53ce8a05..9c3302bab 100644
--- a/net-im/vacuum/vacuum-1.3.0.20180105.recipe
+++ b/net-im/vacuum/vacuum-1.3.0.20180105.recipe
@@ -7,8 +7,8 @@ REVISION="1"
 SOURCE_URI="https://github.com/Vacuum-IM/vacuum-im/archive/$portVersion-Alpha.tar.gz"
 CHECKSUM_SHA256="0c34a9c4ce123085dd0ad572ea6bb252d881b188c42293007d0d16f92340ad52"
 SOURCE_DIR="vacuum-im-$portVersion-Alpha"
-ADDITIONAL_FILES="vacuum.rdef"
 PATCHES="vacuum-$portVersion.patchset"
+ADDITIONAL_FILES="vacuum.rdef"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -33,6 +33,7 @@ REQUIRES="
 	lib:libQt5Xml$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libidn$secondaryArchSuffix