diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch
index 117c4e06a..2873294b8 100644
--- a/app-text/antiword/patches/antiword-0.37.patch
+++ b/app-text/antiword/patches/antiword-0.37.patch
@@ -6,7 +6,7 @@ diff -Naur antiword-0.37/antiword.h antiword-0.37-haiku/antiword.h
  #define ANTIWORD_DIR		"antiword"
  #define FONTNAMES_FILE		"fontnames"
 +#elif defined(__haiku)
-+#define GLOBAL_ANTIWORD_DIR	"/boot/common/data/antiword"
++#define GLOBAL_ANTIWORD_DIR	"/boot/system/data/antiword"
 +#define ANTIWORD_DIR		"antiword"
 +#define FONTNAMES_FILE		"fontnames"
  #elif defined(__CYGMING__)
@@ -28,7 +28,7 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku
 +INSTALL_DATA	= $(INSTALL)
 +
 +# must be equal to DEBUG or NDEBUG
-+DB	= DEBUG
++DB	= NDEBUG
 +# Optimization: -O<n> or debugging: -g
 +OPT	= -O2
 +
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index d63a721d4..92be8b050 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -22,13 +22,8 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 
 REVISION="1"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	glib$secondaryArchSuffix = $portVersion compat >= 1
diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe
index e5c3ed859..aa7268aa0 100644
--- a/dev-libs/libidl/libidl-0.6.8.recipe
+++ b/dev-libs/libidl/libidl-0.6.8.recipe
@@ -12,13 +12,8 @@ CHECKSUM_SHA256="50e8f7674815e42a6e8be32610838d9b7da91b3043784d2b69d17b79c7203e7
 COPYRIGHT="1998-1999 Andrew T. Veliath"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libidl$secondaryArchSuffix = $portVersion
diff --git a/dev-python/argh/python_argh-0.26.1.recipe b/dev-python/argh/argh-0.26.1.recipe
similarity index 98%
rename from dev-python/argh/python_argh-0.26.1.recipe
rename to dev-python/argh/argh-0.26.1.recipe
index 7bde69c3b..954eabb67 100644
--- a/dev-python/argh/python_argh-0.26.1.recipe
+++ b/dev-python/argh/argh-0.26.1.recipe
@@ -17,7 +17,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 SOURCE_DIR="argh-$portVersion"
 
 PROVIDES="
-	python_argh = $portVersion
+	argh = $portVersion
 	"
 
 REQUIRES="
diff --git a/dev-python/pathtools/python_pathtools-0.1.2.recipe b/dev-python/pathtools/pathtools-0.1.2.recipe
similarity index 97%
rename from dev-python/pathtools/python_pathtools-0.1.2.recipe
rename to dev-python/pathtools/pathtools-0.1.2.recipe
index 744a02110..0cda667d2 100644
--- a/dev-python/pathtools/python_pathtools-0.1.2.recipe
+++ b/dev-python/pathtools/pathtools-0.1.2.recipe
@@ -18,7 +18,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 SOURCE_DIR="pathtools-$portVersion"
 
 PROVIDES="
-	python_pathtools = $portVersion
+	pathtools = $portVersion
 	"
 
 REQUIRES="
diff --git a/dev-python/pyyaml/python_pyyaml-3.11.recipe b/dev-python/pyyaml/pyyaml-3.11.recipe
similarity index 98%
rename from dev-python/pyyaml/python_pyyaml-3.11.recipe
rename to dev-python/pyyaml/pyyaml-3.11.recipe
index 484baa4ee..19ad24e4c 100644
--- a/dev-python/pyyaml/python_pyyaml-3.11.recipe
+++ b/dev-python/pyyaml/pyyaml-3.11.recipe
@@ -27,7 +27,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 SOURCE_DIR="PyYAML-$portVersion"
 
 PROVIDES="
-	python_pyyaml = $portVersion
+	pyyaml = $portVersion
 	"
 
 REQUIRES="
diff --git a/dev-python/watchdog/python_watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe
similarity index 93%
rename from dev-python/watchdog/python_watchdog-0.8.2.recipe
rename to dev-python/watchdog/watchdog-0.8.2.recipe
index 3b9e47d3f..bf2ef3f52 100644
--- a/dev-python/watchdog/python_watchdog-0.8.2.recipe
+++ b/dev-python/watchdog/watchdog-0.8.2.recipe
@@ -16,16 +16,16 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 SOURCE_DIR="watchdog-$portVersion"
 
 PROVIDES="
-	python_watchdog = $portVersion
+	watchdog = $portVersion
 	cmd:watchmedo
 	"
 
 REQUIRES="
 	haiku >= $haikuVersion
 	cmd:python
-	python_argh
-	python_pathtools
-	python_pyyaml
+	argh
+	pathtools
+	pyyaml
 	"
 
 BUILD_REQUIRES="
diff --git a/dev-util/astyle/astyle-2.03.recipe b/dev-util/astyle/astyle-2.05.recipe
similarity index 85%
rename from dev-util/astyle/astyle-2.03.recipe
rename to dev-util/astyle/astyle-2.05.recipe
index c9e945f34..4d3794786 100644
--- a/dev-util/astyle/astyle-2.03.recipe
+++ b/dev-util/astyle/astyle-2.05.recipe
@@ -5,13 +5,18 @@ 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_SHA256="22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389"
+SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%20${portVersion}/astyle_${portVersion}_linux.tar.gz"
+CHECKSUM_SHA256="da34eb1f8f12e6f50f1cf674944c0db70c91b203008e11be0f57aa8267823a39"
 LICENSE="GNU LGPL v3"
-COPYRIGHT="1998-2002 by Tal Davidson
-		2006-2013 Jim Pattee"
+
+COPYRIGHT="
+1998-2002 by Tal Davidson \
+2006-2013 Jim Pattee
+"
+
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64 arm ppc"
+
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.