diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b891deda7..d65335cadb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-07 16:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbnetio/utils/netiosrv.hbp
+  * utils/hbformat/hbformat.hbp
+  * utils/hbmk2/hbmk2.hbp
+  * utils/hbi18n/hbi18n.hbp
+  * utils/hbtest/hbtest.hbp
+  * utils/hbrun/hbrun.hbp
+  * config/wce/msvcarm.mk
+  * config/win/msvc.mk
+    + Added -fixed:no to msvc command line. It seems to be needed
+      for ASLR compatibility.
+
 2010-01-07 16:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Updated valgrind example.
@@ -35,8 +47,6 @@
     ; TODO: Enable the same for MinGW.
     ; TOCHECK: Please test this with old MSVC versions and MSVCARM,
                maybe we will need to disable them in some cases.
-    ; QUESTION: I'm unsure of -fixed:no MSVC option. Do we need it
-                to increase security?
 
   * config/wce/msvcarm.mk
     + Changed to use link.exe for linking instead of cl[arm].exe.
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index 56862f6adc..9a8ec19f03 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -68,7 +68,7 @@ SYSLIBS += corelibc
 LIBPATHS := -libpath:$(LIB_DIR)
 LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS += -nologo -nxcompat -dynamicbase -subsystem:windowsce -nodefaultlib:oldnames.lib -nodefaultlib:kernel32.lib
+LDFLAGS += -nologo -nxcompat -dynamicbase -fixed:no -subsystem:windowsce -nodefaultlib:oldnames.lib -nodefaultlib:kernel32.lib
 ifeq ($(filter $(HB_COMPILER_VER),600 700 710),)
    LDFLAGS += -manifest:no
 endif
diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk
index a062dbf9da..03b0f4f9e2 100644
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -73,7 +73,7 @@ LD_OUT := -out:
 LIBPATHS := -libpath:$(LIB_DIR)
 LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS += -nologo -nxcompat -dynamicbase $(LIBPATHS)
+LDFLAGS += -nologo -nxcompat -dynamicbase -fixed:no $(LIBPATHS)
 
 AR := lib.exe
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
diff --git a/harbour/contrib/hbnetio/utils/netiosrv.hbp b/harbour/contrib/hbnetio/utils/netiosrv.hbp
index 7e42a4e60b..7f25850cb6 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv.hbp
+++ b/harbour/contrib/hbnetio/utils/netiosrv.hbp
@@ -9,3 +9,4 @@ netiosrv.prg
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
diff --git a/harbour/utils/hbformat/hbformat.hbp b/harbour/utils/hbformat/hbformat.hbp
index a0f9f8ce52..fd64535c3e 100644
--- a/harbour/utils/hbformat/hbformat.hbp
+++ b/harbour/utils/hbformat/hbformat.hbp
@@ -6,6 +6,7 @@
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
 
 -nulrdd
 hbformat.prg
diff --git a/harbour/utils/hbi18n/hbi18n.hbp b/harbour/utils/hbi18n/hbi18n.hbp
index 23bb227475..8cdbe60274 100644
--- a/harbour/utils/hbi18n/hbi18n.hbp
+++ b/harbour/utils/hbi18n/hbi18n.hbp
@@ -6,6 +6,7 @@
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
 
 -nulrdd
 hbi18n.prg
diff --git a/harbour/utils/hbmk2/hbmk2.hbp b/harbour/utils/hbmk2/hbmk2.hbp
index f9ea692c04..738518ac47 100644
--- a/harbour/utils/hbmk2/hbmk2.hbp
+++ b/harbour/utils/hbmk2/hbmk2.hbp
@@ -6,6 +6,7 @@
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
 
 -nulrdd
 -mt
diff --git a/harbour/utils/hbrun/hbrun.hbp b/harbour/utils/hbrun/hbrun.hbp
index f5bd318cbf..696562ed16 100644
--- a/harbour/utils/hbrun/hbrun.hbp
+++ b/harbour/utils/hbrun/hbrun.hbp
@@ -6,6 +6,7 @@
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
 
 hbrun.prg
 
diff --git a/harbour/utils/hbtest/hbtest.hbp b/harbour/utils/hbtest/hbtest.hbp
index 7a7d333da1..aaf34dc7bd 100644
--- a/harbour/utils/hbtest/hbtest.hbp
+++ b/harbour/utils/hbtest/hbtest.hbp
@@ -6,6 +6,7 @@
 
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
 
 hbtest.prg
 rt_array.prg