diff --git a/src/sys/kernel/Makefile b/src/sys/kernel/Makefile
index fe4bd12..7ae9f6b 100644
--- a/src/sys/kernel/Makefile
+++ b/src/sys/kernel/Makefile
@@ -6,7 +6,7 @@
 include ../Makefile.inc
 
 #  Objects
-OBJS = endtask.o spinlock.o bioscall.o ld.o time.o fork.o syscall.o elf.o file.o systemtask.o exec.o sched.o kpanic.o vitals.o ubthread.o timer.o
+OBJS = sys_call.o endtask.o spinlock.o bioscall.o ld.o time.o fork.o syscall.o elf.o file.o systemtask.o exec.o sched.o kpanic.o vitals.o ubthread.o timer.o
 # ap-boot.o smp.o
 
 all: $(OBJS)
diff --git a/src/sys/kernel/sys_call.S b/src/sys/kernel/sys_call.S
new file mode 100644
index 0000000..bfe27a1
--- /dev/null
+++ b/src/sys/kernel/sys_call.S
@@ -0,0 +1,53 @@
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ $Id$
+
+*****************************************************************************************/
+
+.globl _sysCall
+.text
+.code32
+_sysCall:               
+  cmpl totalCalls,%eax   
+  jae invalidSysCall       
+  pushl %edx              
+  pushl %ecx               
+  pushl %ebx                
+  call *systemCalls(,%eax,4) 
+  jmp done                  
+invalidSysCall:              
+  call invalidCall          
+done:                        
+  popl %ebx                  
+  popl %ecx                 
+  popl %edx                
+  iret                    
+
+/***
+ $Log$
+ END
+ ***/
+
diff --git a/src/sys/kernel/syscall.c b/src/sys/kernel/syscall.c
index b8d3eac..11ed88c 100644
--- a/src/sys/kernel/syscall.c
+++ b/src/sys/kernel/syscall.c
@@ -64,25 +64,6 @@
   "  iret                       \n"
   );
 
-asm(
-  ".globl _sysCall              \n"
-  "_sysCall:                    \n"
-  "  cmpl totalCalls,%eax       \n"
-  "  jae invalidSysCall         \n"  
-  "  pushl %edx                 \n"
-  "  pushl %ecx                 \n"
-  "  pushl %ebx                 \n"
-  "  call *systemCalls(,%eax,4) \n"
-  "  jmp done                   \n"
-  "invalidSysCall:              \n"
-  "  call invalidCall           \n"
-  "done:                        \n"
-  "  popl %ebx                  \n"
-  "  popl %ecx                  \n"
-  "  popl %edx                  \n"
-  "  iret                       \n" /* Exit interrupt               */
-  );
-
 void invalidCall() {
   kprintf("Invalid Sys Call!\n");
   }