diff --git a/src/tools/gensyscalls/Jamfile b/src/tools/gensyscalls/Jamfile
index 140a20fef6..eba5a3efa1 100644
--- a/src/tools/gensyscalls/Jamfile
+++ b/src/tools/gensyscalls/Jamfile
@@ -35,16 +35,15 @@ GenSyscallInfos $(syscallInfos) : $(syscallsHeaderPP) ;
 
 BuildPlatformMain gensyscalls : gensyscalls.cpp $(syscallInfos:S=$(SUFOBJ)) ;
 LinkSharedOSLibs gensyscalls : stdc++.r4 ;
+UsePrivateObjectHeaders gensyscalls.cpp : kernel ;
+UseArchObjectHeaders gensyscalls.cpp : $(OBOS_ARCH) ;
 
 
 # generate the output files
 
 # place them where there are needed
-local syscallFiles = <syscalls>syscalls.S.inc <syscalls>syscall_dispatcher.h ;
 MakeLocate <syscalls>syscalls.S.inc : [ FObjectsDir src kernel libroot os ] ;
 MakeLocate <syscalls>syscall_dispatcher.h : [ FObjectsDir src kernel core ] ;
-#Depends <syscalls>generatedFiles : $(syscallFiles) ;
-#NotFile <syscalls>generatedFiles ;
 
 Depends <dir>objects/x86.R1/kernel/core : <dir>objects/x86.R1/kernel ;
 
@@ -66,7 +65,6 @@ actions GenSyscallsDispatcher1 {
 	$(2[1]) -d $(1)
 }
 
-#GenSyscalls $(syscallFiles) ;
 GenSyscallsFile <syscalls>syscalls.S.inc ;
 GenSyscallsDispatcher <syscalls>syscall_dispatcher.h ;
 
diff --git a/src/tools/gensyscalls/gensyscalls.cpp b/src/tools/gensyscalls/gensyscalls.cpp
index 3b64916f1a..482f5daefd 100644
--- a/src/tools/gensyscalls/gensyscalls.cpp
+++ b/src/tools/gensyscalls/gensyscalls.cpp
@@ -5,6 +5,8 @@
 #include <fstream>
 #include <string>
 
+#include "arch_cpu.h"
+
 #include "gensyscalls.h"
 #include "gensyscalls_common.h"
 
@@ -32,6 +34,10 @@ print_usage(bool error)
 	fprintf((error ? stderr : stdout), kUsage);
 }
 
+enum {
+	PARAMETER_ALIGNMENT	= sizeof(FUNCTION_CALL_PARAMETER_ALIGNMENT_TYPE)
+};
+
 // Main
 class Main {
 public:
@@ -64,6 +70,7 @@ public:
 			}
 		}
 		fSyscallInfos = gensyscall_get_infos(&fSyscallCount);
+		_UpdateSyscallInfos();
 		if (!syscallsFile && !dispatcherFile) {
 			printf("Found %d syscalls.\n", fSyscallCount);
 			return 0;
@@ -88,6 +95,8 @@ public:
 			int paramCount = syscall.parameter_count;
 			int paramSize = 0;
 			gensyscall_parameter_info* parameters = syscall.parameters;
+			// XXX: Currently the SYSCALL macros support 4 byte aligned
+			// parameters only. This has to change, of course.
 			for (int k = 0; k < paramCount; k++) {
 				int size = parameters[k].actual_size;
 				paramSize += (size + 3) / 4 * 4;
@@ -114,10 +123,25 @@ public:
 			int paramCount = syscall.parameter_count;
 			if (paramCount > 0) {
 				gensyscall_parameter_info* parameters = syscall.parameters;
-				file << "*(" << _GetPointerType(parameters[0].type) << ")args";
+				if (parameters[0].size < PARAMETER_ALIGNMENT) {
+					file << "(" << parameters[0].type << ")*("
+						 << "FUNCTION_CALL_PARAMETER_ALIGNMENT_TYPE"
+						 << "*)args";
+				} else {
+					file << "*(" << _GetPointerType(parameters[0].type)
+						<< ")args";
+				}
 				for (int k = 1; k < paramCount; k++) {
-					file << ", *(" << _GetPointerType(parameters[k].type)
-						<< ")((char*)args + " << parameters[k].offset << ")";
+					if (parameters[k].size < PARAMETER_ALIGNMENT) {
+						file << ", (" << parameters[k].type << ")*("
+							<< "FUNCTION_CALL_PARAMETER_ALIGNMENT_TYPE"
+							<< "*)((char*)args + " << parameters[k].offset
+							<< ")";
+					} else {
+						file << ", *(" << _GetPointerType(parameters[k].type)
+							<< ")((char*)args + " << parameters[k].offset
+							<< ")";
+					}
 				}
 			}
 			file << ");" << endl;
@@ -134,9 +158,30 @@ public:
 		return string(type, parenthesis - type) + "*" + parenthesis;
 	}
 
+	void _UpdateSyscallInfos()
+	{
+		// Since getting the parameter offsets and actual sizes doesn't work
+		// as it is now, we overwrite them with values computed using the
+		// parameter alignment type.
+		for (int i = 0; i < fSyscallCount; i++) {
+			gensyscall_syscall_info &syscall = fSyscallInfos[i];
+			int paramCount = syscall.parameter_count;
+			gensyscall_parameter_info* parameters = syscall.parameters;
+			int offset = 0;
+			for (int k = 0; k < paramCount; k++) {
+				if (parameters[k].size < PARAMETER_ALIGNMENT)
+					parameters[k].actual_size = PARAMETER_ALIGNMENT;
+				else
+					parameters[k].actual_size = parameters[k].size;
+				parameters[k].offset = offset;
+				offset += parameters[k].actual_size;
+			}
+		}
+	}
+
 private:
-	const gensyscall_syscall_info	*fSyscallInfos;
-	int								fSyscallCount;
+	gensyscall_syscall_info	*fSyscallInfos;
+	int						fSyscallCount;
 };
 
 // main