diff --git a/src/bin/setversion.cpp b/src/bin/setversion.cpp
index ec2cfa2748..1d5be50ebe 100644
--- a/src/bin/setversion.cpp
+++ b/src/bin/setversion.cpp
@@ -1,35 +1,45 @@
-// Author: Ryan Fleet
-// Created: 12th October 2002
-// Modified: 14th October 2002
+/*
+ * Copyright 2002, Ryan Fleet.
+ * Copyright 2006, Axel Dörfler, axeld@pinc-software.de.
+ *
+ * Distributed under the terms of the MIT license.
+ */
 
 
+#include <AppFileInfo.h>
+#include <String.h>
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <AppFileInfo.h>
 
 
-enum eArgNeeded 
-{ 
+extern const char *__progname;
+
+const char *kProgramName = __progname;
+
+
+enum arg_needed { 
 	switch_needed, major_version, middle_version, minor_version,
 	variety_version, internal_version, long_string, short_string
 };
 
-enum eError
-{
+enum app_error {
+	e_base = B_ERRORS_END,
 	e_unknown, e_app_sys_switch, e_specify_version, e_major_version,
 	e_middle_version, e_minor_version, e_variety_version, e_internal_version,
-	e_expecting, e_long_string, e_short_string, e_no_file, 
+	e_expecting, e_long_string, e_short_string,
 	e_parameter, e_app_twice, e_sys_twice
 };
 
-enum eMode { no_switch, app_switch, sys_switch };
+enum processing_mode { no_switch, app_switch, sys_switch };
 
 
-void usage(const char *app)
+static void
+usage()
 {
-	fprintf(stdout, "Usage: %s filename\n", app);
+	fprintf(stdout, "Usage: %s filename\n", kProgramName);
 	fprintf(stdout, "   [ -system <major> <middle> <minor>\n");
 	fprintf(stdout, "       [ [ d | a | b | g | gm | f ] [ <internal> ] ]\n");
 	fprintf(stdout, "       [ -short <shortVersionString> ]\n");
@@ -41,348 +51,299 @@ void usage(const char *app)
 }
 
 
-int convertVariety(const char *str)
+static int
+convertVariety(const char *str)
 {
-	if(strcmp(str, "d") == 0)
+	if (!strcmp(str, "d") || !strcmp(str, "development"))
 		return 0;
-	else if(strcmp(str, "a") == 0)
+	if (!strcmp(str, "a") || !strcmp(str, "alpha"))
 		return 1;
-	else if(strcmp(str, "b") == 0)
+	if (!strcmp(str, "b") || !strcmp(str, "beta"))
 		return 2;
-	else if(strcmp(str, "g") == 0)
+	if (!strcmp(str, "g") || !strcmp(str, "gamma"))
 		return 3;
-	else if(strcmp(str, "gm") == 0)
+	if (strcmp(str, "gm") || !strcmp(str, "goldenmaster"))
 		return 4;
-	else if(strcmp(str, "f") == 0)
+	if (!strcmp(str, "f") || !strcmp(str, "final"))
 		return 5;
-	else
-		return -1;
+
+	return -1;
 }
 
 
-int errorOut(eError error, const char *thisApp, const char *appName = NULL)
+static void
+errorToString(BString& output, status_t error, const char *appName = NULL)
 {
-	switch(error)
-	{
-	case e_app_sys_switch:
-		fprintf(stderr, "%s: -system or -app expected\n", thisApp);
-		break;
-	case e_specify_version:
-		fprintf(stderr, "%s: you did not specify any version\n", thisApp);
-		break;
-	case e_major_version:
-		fprintf(stderr, "%s: major version number error\n", thisApp);
-		break;
-	case e_middle_version:
-		fprintf(stderr, "%s: middle version number error\n", thisApp);
-		break;
-	case e_minor_version:
-		fprintf(stderr, "%s: minor version number error\n", thisApp);
-		break;
-	case e_variety_version:
-		fprintf(stderr, "%s: variety letter error\n", thisApp);
-		break;
-	case e_internal_version:
-		fprintf(stderr, "%s: internal version number error\n", thisApp);
-		break;
-	case e_expecting:
-		fprintf(stderr, "%s: expecting -short, -long, -app or -system\n", thisApp);
-		break;
-	case e_long_string: 
-		fprintf(stderr, "%s: expecting long version string\n", thisApp);
-		break;
-	case e_short_string:
-		fprintf(stderr, "%s: expecting short version string\n", thisApp);
-		break;
-	case e_no_file:
-		fprintf(stderr, "%s: error No such file or directory opening file %s!\n", thisApp, appName);
-		break;
-	case e_parameter:
-		fprintf(stderr, "%s: parameter error\n", thisApp);
-		break;
-	case e_app_twice:
-		fprintf(stderr, "%s: you cannot specify the app version twice\n", thisApp);
-		break;
-	case e_sys_twice:
-		fprintf(stderr, "%s: you cannot specify the system version twice\n", thisApp);
-		break;
-	case e_unknown:
-		fprintf(stderr, "%s: unknown internal error\n", thisApp);
-		break;
-	};
-	
-	usage(thisApp);
+	switch (error) {
+		case e_app_sys_switch:
+			output = "-system or -app expected\n";
+			break;
+		case e_specify_version:
+			output = "you did not specify any version\n";
+			break;
+		case e_major_version:
+			output = "major version number error\n";
+			break;
+		case e_middle_version:
+			output = "middle version number error\n";
+			break;
+		case e_minor_version:
+			output = "minor version number error\n";
+			break;
+		case e_variety_version:
+			output = "variety letter error\n";
+			break;
+		case e_internal_version:
+			output = "internal version number error\n";
+			break;
+		case e_expecting:
+			output = "expecting -short, -long, -app or -system\n";
+			break;
+		case e_long_string: 
+			output = "expecting long version string\n";
+			break;
+		case e_short_string:
+			output = "expecting short version string\n";
+			break;
+		case e_parameter:
+			output = "parameter error\n";
+			break;
+		case e_app_twice:
+			output = "you cannot specify the app version twice\n";
+			break;
+		case e_sys_twice:
+			output = "you cannot specify the system version twice\n";
+			break;
+		case e_unknown:
+			output = "unknown internal error\n";
+			break;
+
+		default:
+			output = strerror(error);
+
+			if (appName != NULL) {
+				output += ": ";
+				output += appName;
+			}
+			break;
+	}
+}
+
+
+static int
+errorOut(status_t error, const char *appName = NULL, bool showUsage = true)
+{
+	BString output;
+	errorToString(output, error, appName);
+
+	fprintf(stderr, "%s: %s", kProgramName, output.String());
+
+	if (showUsage)
+		usage();
+
 	exit(1);
 }
 
 
-void parse(bool &bSysModified, bool &bAppModified, eArgNeeded &argNeeded, eMode &mode, version_info &sysInfo, version_info &appInfo, int argc, char *argv[])
+static void
+parse(bool &systemModified, bool &appModified, arg_needed &argNeeded,
+	processing_mode &mode, version_info &systemVersion, version_info &appVersion,
+	int argc, char *argv[])
 {
-	bSysModified = false;
-	bAppModified = false;
+	systemModified = false;
+	appModified = false;
 	mode = no_switch;
 	argNeeded = switch_needed;
-	
-	for(int i = 2; i < argc; ++i)
-	{
-		switch(argNeeded)
-		{
-		case switch_needed:
-			{
-				if(strcmp(argv[i], "-app") == 0)
-				{
-					if(mode == app_switch)
-						errorOut(e_app_twice, argv[0]);
-					if(true == bAppModified)
-						errorOut(e_parameter, argv[0]);
+
+	for (int i = 2; i < argc; ++i) {
+		version_info &version = mode == app_switch ? appVersion : systemVersion;
+
+		switch (argNeeded) {
+			case switch_needed:
+				if (strcmp(argv[i], "-app") == 0) {
+					if (mode == app_switch)
+						errorOut(e_app_twice);
+					if (appModified)
+						errorOut(e_parameter);
+
 					mode = app_switch;
 					argNeeded = major_version;
-					bAppModified = true;
-				}
-				else if(strcmp(argv[i], "-system") == 0)
-				{
-					if(mode == sys_switch)
-						errorOut(e_sys_twice, argv[0]);
-					if(true == bSysModified)
-						errorOut(e_parameter, argv[0]);
+					appModified = true;
+				} else if (strcmp(argv[i], "-system") == 0) {
+					if (mode == sys_switch)
+						errorOut(e_sys_twice);
+					if (systemModified)
+						errorOut(e_parameter);
+
 					mode = sys_switch;
 					argNeeded = major_version;
-					bSysModified = true;
-				}
-				else if(strcmp(argv[i], "-long") == 0)
-				{
-					if(mode == no_switch)
-						errorOut(e_app_sys_switch, argv[0]); 
-						
+					systemModified = true;
+				} else if (strcmp(argv[i], "-long") == 0) {
+					if (mode == no_switch)
+						errorOut(e_app_sys_switch); 
+
 					argNeeded = long_string;
-				}
-				else if(strcmp(argv[i], "-short") == 0)
-				{
-					if(mode == no_switch)
-						errorOut(e_app_sys_switch, argv[0]); 
+				} else if (strcmp(argv[i], "-short") == 0) {
+					if (mode == no_switch)
+						errorOut(e_app_sys_switch); 
+
 					argNeeded = short_string;
-				}
-				else if(mode == no_switch)
-					errorOut(e_app_sys_switch, argv[0]);
-				else if(strncmp(argv[i], "-", 1) == 0)
-					errorOut(e_parameter, argv[0]);
+				} else if (mode == no_switch)
+					errorOut(e_app_sys_switch);
+				else if (strncmp(argv[i], "-", 1) == 0)
+					errorOut(e_parameter);
 				else
-					errorOut(e_expecting, argv[0]); 
-			} break;
-			
-		case major_version:
-			{
-				if(mode == app_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_major_version, argv[0]); 
-					
-					appInfo.major = atoi(argv[i]);
-				}
-				else if(mode == sys_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_major_version, argv[0]);
-					
-					sysInfo.major = atoi(argv[i]);
-				}
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
-			
+					errorOut(e_expecting); 
+				break;
+
+			case major_version:
+				if (isalpha(argv[i][0]))
+					errorOut(e_major_version); 
+
+				version.major = atoi(argv[i]);
 				argNeeded = middle_version;	
-			} break;
-			
-		case middle_version:
-			{
-				if(mode == app_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_middle_version, argv[0]); 
-					
-					appInfo.middle = atoi(argv[i]);
-				}
-				else if(mode == sys_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_middle_version, argv[0]);
-					
-					sysInfo.middle = atoi(argv[i]);	
-				}
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
+				break;
+
+			case middle_version:
+				if (isalpha(argv[i][0]))
+					errorOut(e_middle_version); 
+
+				version.middle = atoi(argv[i]);
 				argNeeded = minor_version;
-			} break;
-			
-		case minor_version:
-			{
-				if(mode == app_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_minor_version, argv[0]);
-					
-					appInfo.minor = atoi(argv[i]);	
-				}
-				else if(mode == sys_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_minor_version, argv[0]);
-					
-					sysInfo.minor = atoi(argv[i]);	
-				}
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
-				
-				if(i >= argc-1)
-				{
+				break;
+
+			case minor_version:
+				if (isalpha(argv[i][0]))
+					errorOut(e_minor_version);
+
+				version.minor = atoi(argv[i]);	
+
+				if (i >= argc-1) {
 					argNeeded = switch_needed;
 					break;
-				}		
-				
+				}
+
 				argNeeded = variety_version;
-			} break;
-		case variety_version:
+				break;
+
+			case variety_version:
 			{
-				if(strncmp(argv[i], "-", 1) == 0)
-				{
-					--i;
+				if (!strncmp(argv[i], "-", 1)) {
+					i--;
 					argNeeded = switch_needed;
 					break;
 				}
-			
-				if(mode == app_switch)
-				{
-					int v = convertVariety(argv[i]);
-					if(v < 0)
-						errorOut(e_variety_version, argv[0]);
-					appInfo.variety = v;
-				}
-				else if(mode == sys_switch)
-				{	
-					int v = convertVariety(argv[i]);
-					if(v < 0)
-						errorOut(e_variety_version, argv[0]);
-					sysInfo.variety = v;
-				}
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
+
+				int variety = convertVariety(argv[i]);
+				if (variety < 0)
+					errorOut(e_variety_version);
+
+				version.variety = variety;
 				argNeeded = internal_version;
-			} break;
-		case internal_version:
-			{
-				if(mode == app_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_expecting, argv[0]);
-					
-					appInfo.internal = atoi(argv[i]);	
-				}
-				else if(mode == sys_switch)
-				{
-					if(isalpha(argv[i][0]))
-						errorOut(e_expecting, argv[0]); 
-					
-					sysInfo.internal = atoi(argv[i]);	
-				}
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
+				break;
+			}
+
+			case internal_version:
+				if (isalpha(argv[i][0]))
+					errorOut(e_expecting);
+
+				version.internal = atoi(argv[i]);	
 				argNeeded = switch_needed;
-			} break;
-		case long_string:
-			{
-				if(mode == app_switch)
-					strcpy(appInfo.long_info, argv[i]);
-				else if(mode == sys_switch)
-					strcpy(sysInfo.long_info, argv[i]);
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
+				break;
+
+			case long_string:
+				strcpy(version.long_info, argv[i]);
 				argNeeded = switch_needed;
-			} break;
-		case short_string:
-			{
-				if(mode == app_switch)
-					strcpy(appInfo.short_info, argv[i]);
-				else if(mode == sys_switch)
-					strcpy(sysInfo.short_info, argv[i]);
-				else
-					errorOut(e_unknown, argv[0]); // (should never reach here)
+				break;
+
+			case short_string:
+				strcpy(version.short_info, argv[i]);
 				argNeeded = switch_needed;
-			} break;
-		};	
+				break;
+		}
+	}
+
+	if (mode == no_switch)
+		errorOut(e_app_sys_switch);
+
+	switch (argNeeded) {
+		case major_version:
+			errorOut(e_major_version);
+			break;
+		case middle_version:
+			errorOut(e_middle_version);
+			break;
+		case minor_version:
+			errorOut(e_minor_version);
+			break;
+		case variety_version:
+			errorOut(e_variety_version);
+			break;
+		case internal_version:
+			errorOut(e_internal_version);
+			break;
+		case long_string:
+			errorOut(e_long_string);
+			break;
+		case short_string:
+			errorOut(e_short_string);
+			break;
+		case switch_needed:
+			// all is well
+			break;
 	}
-	
-	if(mode == no_switch)
-		errorOut(e_app_sys_switch, argv[0]);
-		
-	switch(argNeeded)
-	{
-	case major_version:
-		errorOut(e_major_version, argv[0]);
-		break;
-	case middle_version:
-		errorOut(e_middle_version, argv[0]);
-		break;
-	case minor_version:
-		errorOut(e_minor_version, argv[0]);
-		break;
-	case variety_version:
-		errorOut(e_variety_version, argv[0]);
-		break;
-	case internal_version:
-		errorOut(e_internal_version, argv[0]);
-		break;
-	case long_string:
-		errorOut(e_long_string, argv[0]);
-		break;
-	case short_string:
-		errorOut(e_short_string, argv[0]);
-		break;
-	case switch_needed:
-		// all is well. continue
-		break;
-	};
 }
 
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-	if(argc < 3)
-	{
-		if(argc < 2)
-			return errorOut(e_app_sys_switch, argv[0]);
-		else
-			return errorOut(e_specify_version, argv[0]);
-	}
-	
-	eMode mode;
-	eArgNeeded argNeeded;
-	version_info sysInfo, appInfo;
-	bool bSysModified, bAppModified;
+	if (argc < 3) {
+		if (argc < 2)
+			return errorOut(e_app_sys_switch);
 
-	parse(bSysModified, bAppModified, argNeeded, mode, sysInfo, appInfo, argc, argv);
-			
-	BFile file(argv[1], B_READ_WRITE);
-	if(file.InitCheck() != B_OK)
-		errorOut(e_no_file, argv[0], argv[1]);
-	 
-	BAppFileInfo info(&file);
-	if(info.InitCheck() != B_OK)
-		errorOut(e_unknown, argv[0]);
-		
-	status_t status;
-	if(bAppModified)
-	{
-		status = info.SetVersionInfo(&appInfo, B_APP_VERSION_KIND);
-		if(status < 0)
-			errorOut(e_unknown, argv[0]);
+		return errorOut(e_specify_version);
 	}
-	
-	if(bSysModified)
-	{
-		status = info.SetVersionInfo(&sysInfo, B_SYSTEM_VERSION_KIND);	
-		if(status < 0)
-			errorOut(e_unknown, argv[0]);
+
+	// reset version infos
+
+	version_info systemVersion, appVersion;
+	memset(&systemVersion, 0, sizeof(version_info));
+	memset(&appVersion, 0, sizeof(version_info));
+
+	// process arguments
+
+	processing_mode mode;
+	arg_needed argNeeded;
+	bool systemModified, appModified;
+
+	parse(systemModified, appModified, argNeeded, mode, systemVersion,
+		appVersion, argc, argv);
+
+	// write back changes
+
+	BFile file;
+	status_t status = file.SetTo(argv[1], B_READ_WRITE);
+	if (status != B_OK)
+		errorOut(status, argv[1], false);
+
+	BAppFileInfo info;
+	status = info.SetTo(&file);
+	if (status != B_OK)
+		errorOut(status, argv[1], false);
+
+	if (appModified) {
+		status = info.SetVersionInfo(&appVersion, B_APP_VERSION_KIND);
+		if (status < B_OK)
+			errorOut(status, NULL, false);
+	}
+
+	if (systemModified) {
+		status = info.SetVersionInfo(&systemVersion, B_SYSTEM_VERSION_KIND);	
+		if (status < B_OK)
+			errorOut(status, NULL, false);
 	}	
-	
+
 	return 0;
 }