diff --git a/freeldr/Makefile b/freeldr/Makefile
new file mode 100644
index 00000000000..ec556f467cd
--- /dev/null
+++ b/freeldr/Makefile
@@ -0,0 +1,59 @@
+#
+#  FreeLoader
+#  Copyright (C) 1999, 2000, 2001  Brian Palmer  <brianp@sginet.com>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+# Windows is default host environment
+ifeq ($(HOST),)
+HOST = mingw32-windows
+endif
+
+#
+# Choose various options
+#
+ifeq ($(HOST),mingw32-linux)
+RM			= rm -f
+CP			= cp -f 
+MKDIR		= mkdir
+SEP      = /
+else
+RM			= cmd /C del
+CP			= copy /Y 
+MKDIR		= md
+SEP      = \$(EMPTY_VAR)
+endif
+
+NASM_CMD	= nasm
+NFLAGS = -fwin32 -dwin32
+BIN2C		= ..$(SEP)tools$(SEP)bin2c
+TOOLSDIR	= ..$(SEP)tools
+
+all:
+	$(MAKE) -C tools
+	$(MAKE) -C bootsect
+	$(MAKE) -C freeldr
+	$(MAKE) -C install
+	$(MAKE) -C fdebug
+
+clean:
+	$(MAKE) -C bootsect clean
+	$(MAKE) -C freeldr clean
+	$(MAKE) -C install clean
+	$(MAKE) -C fdebug clean
+	$(MAKE) -C tools clean
+
+.PHONY : clean
diff --git a/freeldr/fdebug/.cvsignore b/freeldr/fdebug/.cvsignore
new file mode 100755
index 00000000000..f89f4eb87ec
--- /dev/null
+++ b/freeldr/fdebug/.cvsignore
@@ -0,0 +1 @@
+*.res
diff --git a/freeldr/freeldr/CHANGELOG b/freeldr/freeldr/CHANGELOG
index 6bd9bfd1467..d29e471ac9f 100644
--- a/freeldr/freeldr/CHANGELOG
+++ b/freeldr/freeldr/CHANGELOG
@@ -1,3 +1,10 @@
+Changes in v1.8.15 (29/08/2003) (chorns)
+
+- Add top-level makefile
+- Add fdebug/.cvsignore
+- Don't use rdel to remove files in tools/Makefile
+- Remove warning in freeldr/mm/meminit.c
+
 Changes in v1.8.14 (10/08/2003) (chorns)
 
 - Clear screen to black when booting ReactOS
diff --git a/freeldr/freeldr/include/version.h b/freeldr/freeldr/include/version.h
index 9bee577bc2b..5837b19f615 100644
--- a/freeldr/freeldr/include/version.h
+++ b/freeldr/freeldr/include/version.h
@@ -22,7 +22,7 @@
 
 
 /* just some stuff */
-#define VERSION			"FreeLoader v1.8.14"
+#define VERSION			"FreeLoader v1.8.15"
 #define COPYRIGHT		"Copyright (C) 1998-2003 Brian Palmer <brianp@sginet.com>"
 #define AUTHOR_EMAIL	"<brianp@sginet.com>"
 #define BY_AUTHOR		"by Brian Palmer"
@@ -36,7 +36,7 @@
 //
 #define FREELOADER_MAJOR_VERSION	1
 #define FREELOADER_MINOR_VERSION	8
-#define FREELOADER_PATCH_VERSION	14
+#define FREELOADER_PATCH_VERSION	15
 
 
 #ifndef ASM
diff --git a/freeldr/freeldr/mm/meminit.c b/freeldr/freeldr/mm/meminit.c
index b8a281e26f5..f04bcf92ef6 100644
--- a/freeldr/freeldr/mm/meminit.c
+++ b/freeldr/freeldr/mm/meminit.c
@@ -189,7 +189,7 @@ U32 MmGetAddressablePageCountIncludingHoles(PBIOS_MEMORY_MAP BiosMemoryMap, U32
 	// off-by-one error
 	if (EndAddress >= 0xFFFFFFFF)
 	{
-		EndAddress = 0x100000000;
+		EndAddress = 0x100000000LL;
 
 		DbgPrint((DPRINT_MEMORY, "MmGetEndAddressOfAnyMemory() returned 0xFFFFFFFF, correcting to be 0x100000000.\n"));
 	}
diff --git a/freeldr/tools/Makefile b/freeldr/tools/Makefile
index 631975b724e..4311925a915 100644
--- a/freeldr/tools/Makefile
+++ b/freeldr/tools/Makefile
@@ -22,7 +22,12 @@
 # PROGRAMS
 #
 CC			= gcc
-RM			= rdel
+
+ifeq ($(HOST),mingw32-linux)
+RM			= rm -f
+else
+RM			= cmd /C del
+endif
 
 #############################################