diff --git a/dev-util/astyle/astyle-2.03.recipe b/dev-util/astyle/astyle-2.03.recipe
new file mode 100644
index 000000000..86dd95272
--- /dev/null
+++ b/dev-util/astyle/astyle-2.03.recipe
@@ -0,0 +1,63 @@
+SUMMARY="A source code formatter and beautifier for C, C++, C# and Java"
+DESCRIPTION="
+Artistic Style is a filter written in C++ that automatically
+re-indents and re-formats C / C++ / C# / Java source files. It can be
+used from a command line, or it can be incorporated as classes in
+another C++ program.
+"
+HOMEPAGE="http://astyle.sourceforge.net" 
+SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%202.03/astyle_2.03_linux.tar.gz"
+CHECKSUM_MD5="ba84eaa8564155babd4ba1458d4eaa11"
+LICENSE="GNU LGPL v3"
+COPYRIGHT="1998-2002 by Tal Davidson
+		2006-2013 Jim Pattee"
+REVISION="1"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+    commandSuffix=
+    commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	astyle$secondaryArchSuffix = $portVersion
+	cmd:astyle$commandSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:g++$secondaryArchSuffix
+	"
+
+SOURCE_DIR="astyle"
+
+BUILD()
+{
+	cd build/gcc
+	make prefix=$prefix
+}
+
+INSTALL()
+{
+	cd build/gcc
+	make install \
+	prefix=$prefix \
+	SYSCONF_PATH=$docDir \
+	INSTALL=install
+}
diff --git a/dev-util/astyle/astyle-r339.recipe b/dev-util/astyle/astyle-r339.recipe
deleted file mode 100644
index 95757a163..000000000
--- a/dev-util/astyle/astyle-r339.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code." 
-HOMEPAGE="http://astyle.sourceforge.net" 
-SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#339"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd astyle-r339/build/gcc
-	make prefix=$(finddir B_COMMON_DIRECTORY)
-}
-
-INSTALL()
-{
-	cd astyle-r339/build/gcc
-	make install \
-	prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
-	SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \
-	INSTALL=install
-}
-LICENSE="GNU LGPL v3"
-COPYRIGHT="1998-2002 by Tal Davidson
-		2006-2012 Jim Pattee"
diff --git a/dev-util/astyle/astyle-r361.recipe b/dev-util/astyle/astyle-r361.recipe
deleted file mode 100644
index 7dcb35fff..000000000
--- a/dev-util/astyle/astyle-r361.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code." 
-HOMEPAGE="http://astyle.sourceforge.net" 
-SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#361"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd astyle-r361/build/gcc
-	make prefix=$(finddir B_COMMON_DIRECTORY)
-}
-
-INSTALL()
-{
-	cd astyle-r361/build/gcc
-	make install \
-	prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
-	SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \
-	INSTALL=install
-}
-LICENSE="GNU LGPL v3"
-COPYRIGHT="1998-2002 by Tal Davidson
-		2006-2012 Jim Pattee"