diff --git a/reactos/lib/kernel32/kernel32.def b/reactos/lib/kernel32/kernel32.def
index 45b2b7602f8..618ac7c4438 100644
--- a/reactos/lib/kernel32/kernel32.def
+++ b/reactos/lib/kernel32/kernel32.def
@@ -65,6 +65,7 @@ ConnectNamedPipe@8
 ConsoleMenuControl@12
 ContinueDebugEvent@12
 ConvertDefaultLocale@4
+ConvertThreadToFiber@4
 CopyFileA@12
 CopyFileExA@24
 CopyFileExW@24
@@ -76,6 +77,7 @@ CreateDirectoryExW@12
 CreateDirectoryW@8
 CreateEventA@16
 CreateEventW@16
+CreateFiber@12
 CreateFileA@28
 CreateFileMappingA@24
 CreateFileMappingW@24
@@ -104,6 +106,7 @@ DefineDosDeviceA@12
 DefineDosDeviceW@12
 DeleteAtom@4
 DeleteCriticalSection@4
+DeleteFiber@4
 DeleteFileA@4
 DeleteFileW@4
 DeviceIoControl@32
@@ -231,6 +234,7 @@ GetCurrencyFormatW@24
 GetCurrentConsoleFont@12
 GetCurrentDirectoryA@8
 GetCurrentDirectoryW@8
+GetCurrentFiber@0
 GetCurrentProcess@0
 GetCurrentProcessId@0
 GetCurrentThread@0
@@ -251,6 +255,7 @@ GetEnvironmentVariableA@12
 GetEnvironmentVariableW@12
 GetExitCodeProcess@8
 GetExitCodeThread@8
+GetFiberData@0
 GetFileAttributesA@4
 GetFileAttributesW@4
 GetFileInformationByHandle@8
@@ -580,6 +585,7 @@ SizeofResource@8
 Sleep@4
 SleepEx@8
 SuspendThread@4
+SwitchToFiber@4
 SwitchToThread@0
 SystemTimeToFileTime@8
 SystemTimeToTzSpecificLocalTime@12
diff --git a/reactos/lib/kernel32/kernel32.edf b/reactos/lib/kernel32/kernel32.edf
index 72a3ee8fa83..66cee16e97c 100644
--- a/reactos/lib/kernel32/kernel32.edf
+++ b/reactos/lib/kernel32/kernel32.edf
@@ -1,4 +1,4 @@
-; $Id: kernel32.edf,v 1.7 2000/08/05 18:01:49 dwelch Exp $
+; $Id: kernel32.edf,v 1.8 2000/08/14 14:33:23 ea Exp $
 ;
 ; kernel32.edf
 ;
@@ -69,6 +69,7 @@ ConnectNamedPipe=ConnectNamedPipe@8
 ConsoleMenuControl=ConsoleMenuControl@12
 ContinueDebugEvent=ContinueDebugEvent@12
 ConvertDefaultLocale=ConvertDefaultLocale@4
+ConvertThreadToFiber=ConvertThreadToFiber@4
 CopyFileA=CopyFileA@12
 CopyFileExA=CopyFileExA@24
 CopyFileExW=CopyFileExW@24
@@ -80,6 +81,7 @@ CreateDirectoryExW=CreateDirectoryExW@12
 CreateDirectoryW=CreateDirectoryW@8
 CreateEventA=CreateEventA@16
 CreateEventW=CreateEventW@16
+CreateFiber=CreateFiber@12
 CreateFileA=CreateFileA@28
 CreateFileMappingA=CreateFileMappingA@24
 CreateFileMappingW=CreateFileMappingW@24
@@ -108,6 +110,7 @@ DefineDosDeviceA=DefineDosDeviceA@12
 DefineDosDeviceW=DefineDosDeviceW@12
 DeleteAtom=DeleteAtom@4
 DeleteCriticalSection=DeleteCriticalSection@4
+DeleteFiber=DeleteFiber@4
 DeleteFileA=DeleteFileA@4
 DeleteFileW=DeleteFileW@4
 DeviceIoControl=DeviceIoControl@32
@@ -235,6 +238,7 @@ GetCurrencyFormatW=GetCurrencyFormatW@24
 GetCurrentConsoleFont=GetCurrentConsoleFont@12
 GetCurrentDirectoryA=GetCurrentDirectoryA@8
 GetCurrentDirectoryW=GetCurrentDirectoryW@8
+GetCurrentFiber=GetCurrentFiber@0
 GetCurrentProcess=GetCurrentProcess@0
 GetCurrentProcessId=GetCurrentProcessId@0
 GetCurrentThread=GetCurrentThread@0
@@ -256,6 +260,7 @@ GetEnvironmentVariableA=GetEnvironmentVariableA@12
 GetEnvironmentVariableW=GetEnvironmentVariableW@12
 GetExitCodeProcess=GetExitCodeProcess@8
 GetExitCodeThread=GetExitCodeThread@8
+GetFiberData=GetFiberData@0
 GetFileAttributesA=GetFileAttributesA@4
 GetFileAttributesW=GetFileAttributesW@4
 GetFileInformationByHandle=GetFileInformationByHandle@8
@@ -585,6 +590,7 @@ SizeofResource=SizeofResource@8
 Sleep=Sleep@4
 SleepEx=SleepEx@8
 SuspendThread=SuspendThread@4
+SwitchToFiber=SwitchToFiber@4
 SwitchToThread=SwitchToThread@0
 SystemTimeToFileTime=SystemTimeToFileTime@8
 SystemTimeToTzSpecificLocalTime=SystemTimeToTzSpecificLocalTime@12
diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile
index 1883d166ed8..693f886302e 100644
--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.37 2000/08/12 19:33:18 dwelch Exp $
+# $Id: makefile,v 1.38 2000/08/14 14:33:24 ea Exp $
 #
 # ReactOS Operating System
 #
@@ -58,7 +58,10 @@ NLS_OBJECTS =  nls/codepage.o nls/cpmisc.o nls/cptable.o\
  nls/lcSLV.o nls/lcSQI.o nls/lcSRB.o nls/lcSRL.o nls/lcSVE.o nls/lcSVF.o nls/lcTRK.o nls/lcUKR.o\
  nls/locale.o nls/mbtowc.o nls/wctomb.o nls/ole2nls.o
 
-THREAD_OBJECTS = thread/thread.o thread/tls.o
+THREAD_OBJECTS =\
+	thread/fiber.o	\
+	thread/thread.o	\
+	thread/tls.o
 
 PROCESS_OBJECTS = \
 	process/proc.o \
diff --git a/reactos/lib/kernel32/process/fiber.c b/reactos/lib/kernel32/process/fiber.c
deleted file mode 100644
index 870c8e7a037..00000000000
--- a/reactos/lib/kernel32/process/fiber.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $Id: fiber.c,v 1.1 1999/05/21 05:42:08 ea Exp $
- *
- * fiber.c
- *
- * ReactOS Kernel32.dll
- *
- */
-#include <windows.h>
-
-
-/**********************************************************************
- *	ConvertThreadToFiber
- */
-LPVOID
-STDCALL
-ConvertThreadToFiber(
-	LPVOID lpParameter
-	)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return NULL;
-}
-
-
-/**********************************************************************
- *	CreateFiber
- */
-LPVOID
-STDCALL
-CreateFiber(
-	DWORD			dwStackSize,
-	LPFIBER_START_ROUTINE	lpStartAddress,
-	LPVOID			lpParameter
-	)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return NULL;
-}
-
-
-/**********************************************************************
- *	DeleteFiber
- */
-VOID
-STDCALL
-DeleteFiber(
-	LPVOID	lpFiber
-	)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return;
-}
-
-
-/**********************************************************************
- *	GetCurrentFiber
- */
-PVOID
-STDCALL
-GetCurrentFiber(VOID)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return NULL;
-}
-
-
-/**********************************************************************
- *	GetFiberData
- */
-PVOID
-STDCALL
-GetFiberData(VOID)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return NULL;
-}
-
-
-/**********************************************************************
- *	SwitchToFiber
- */
-VOID
-STDCALL
-SwitchToFiber(
-	LPVOID	lpFiber
-	)
-{
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return;
-}
-
-
-/* EOF */