diff --git a/reactos/lib/user32/makefile_rex b/reactos/lib/user32/makefile_rex
index 4751ef3fec4..1093caaefce 100644
--- a/reactos/lib/user32/makefile_rex
+++ b/reactos/lib/user32/makefile_rex
@@ -1,4 +1,4 @@
-# $Id: makefile_rex,v 1.11 2000/08/18 22:27:02 dwelch Exp $
+# $Id: makefile_rex,v 1.12 2000/09/10 10:14:39 ea Exp $
 #
 # ReactOS Operating System
 #
@@ -16,31 +16,84 @@ DLLTARGET=$(TARGET).dll
 
 all: $(DLLTARGET)
 
-INTERNAL_OBJECTS = internal/menu.o internal/heapdup.o internal/nc.o\
-		 internal/win.o internal/dce.o internal/msg.o internal/queue.o\
-		internal/signal.o internal/event.o internal/timer.o internal/region.o\
-		internal/text.o internal/defwnd.o internal/paint.o internal/uitools.o\
-		internal/dialog.o internal/winpos.o
+INTERNAL_OBJECTS = \
+	internal/menu.o		\
+	internal/heapdup.o	\
+	internal/nc.o		\
+	internal/win.o		\
+	internal/dce.o		\
+	internal/msg.o		\
+	internal/queue.o	\
+	internal/signal.o	\
+	internal/event.o	\
+	internal/timer.o	\
+	internal/region.o	\
+	internal/text.o		\
+	internal/defwnd.o	\
+	internal/paint.o	\
+	internal/uitools.o	\
+	internal/dialog.o	\
+	internal/winpos.o
 
-MISC_OBJECTS = misc/sprintf.o  misc/dllmain.o misc/string.o misc/sysmetr.o misc/winstat.o\
-	misc/bitmap.o misc/cursor.o misc/vk.o misc/stubs.o misc/stubsa.o misc/stubsw.o
+MISC_OBJECTS = \
+	misc/sprintf.o		\
+	misc/dllmain.o		\
+	misc/string.o		\
+	misc/sysmetr.o		\
+	misc/winstat.o		\
+	misc/bitmap.o		\
+	misc/cursor.o		\
+	misc/vk.o		\
+	misc/stubs.o		\
+	misc/stubsa.o		\
+	misc/stubsw.o
 
 
-WINDOWS_OBJECTS = windows/wndproc.o windows/win.o windows/hook.o windows/spy.o\
-		windows/queue.o windows/winpos.o windows/class.o windows/dc.o\
-		windows/timer.o windows/rect.o windows/msg.o windows/input.o windows/property.o\
-		windows/focus.o windows/paint.o windows/msgbox.o windows/dialog.o\
-		windows/scroll.o windows/defdlg.o 
+WINDOWS_OBJECTS = \
+	windows/wndproc.o	\
+	windows/win.o		\
+	windows/hook.o		\
+	windows/spy.o		\
+	windows/queue.o		\
+	windows/winpos.o	\
+	windows/class.o		\
+	windows/dc.o		\
+	windows/timer.o		\
+	windows/rect.o		\
+	windows/msg.o		\
+	windows/input.o		\
+	windows/property.o	\
+	windows/focus.o		\
+	windows/paint.o		\
+	windows/msgbox.o	\
+	windows/dialog.o	\
+	windows/scroll.o	\
+	windows/defdlg.o 
 
-GRAPHICS_OBJECTS = graphics/rect.o graphics/caret.o graphics/text.o graphics/syscol.o graphics/fill.o\
-		graphics/draw.o graphics/icon.o
+GRAPHICS_OBJECTS = \
+	graphics/rect.o		\
+	graphics/caret.o	\
+	graphics/text.o		\
+	graphics/syscol.o	\
+	graphics/fill.o		\
+	graphics/draw.o		\
+	graphics/icon.o
 
-CONTROLS_OBJECTS = controls/button.o controls/combo.o controls/edit.o controls/icontitle.o controls/listbox.o\
-		controls/widgets.o controls/menu.o controls/scroll.o controls/static.o
+CONTROLS_OBJECTS = \
+	controls/button.o	\
+	controls/combo.o	\
+	controls/edit.o		\
+	controls/icontitle.o	\
+	controls/listbox.o	\
+	controls/widgets.o	\
+	controls/menu.o		\
+	controls/scroll.o	\
+	controls/static.o
 
-RESOURCE_OBJECTS = resources/sysres.o
+RESOURCE_OBJECTS = \
+	resources/sysres.o
 
-RESOURCE_OBJECT = user32.coff
+RESOURCE_OBJECT = $(TARGET).coff
 
 OBJECTS = $(MISC_OBJECTS) $(INTERNAL_OBJECTS) $(GRAPHICS_OBJECTS) $(RESOURCE_OBJECTS) $(RESOURCE_OBJECT)\
 	$(CONTROLS_OBJECTS) $(WINDOWS_OBJECTS)
@@ -94,6 +147,8 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def
 	- $(RM) temp.exp
 	$(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym
 
+$(TARGET).coff: $(TARGET).rc
+
 clean: $(CLEAN_FILES:%=%_clean)
 
 $(CLEAN_FILES:%=%_clean): %_clean:
diff --git a/reactos/lib/user32/user32.rc b/reactos/lib/user32/user32.rc
index f7d34665e7a..5d6e29b806c 100644
--- a/reactos/lib/user32/user32.rc
+++ b/reactos/lib/user32/user32.rc
@@ -1,11 +1,11 @@
-#include "../../include/defines.h"
-#include "../../include/reactos/resource.h"
+#include <defines.h>
+#include <reactos/resource.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION	0,0,13,0
-	PRODUCTVERSION	0,0,13,0
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
 	FILEFLAGSMASK	0x3fL
 #ifdef _DEBUG
 	FILEFLAGS	0x1L
@@ -22,12 +22,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName",	RES_STR_COMPANY_NAME
             VALUE "FileDescription",	"ReactOS User API Client Dll\0"
-            VALUE "FileVersion",	"post 0.0.13\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
             VALUE "InternalName",	"user32\0"
             VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",	"user32.dll\0"
             VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
@@ -55,4 +55,4 @@ BEGIN
         PUSHBUTTON "&Ignore", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Yes", 6, 206, 26, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
\ No newline at end of file
+END