diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 473c05d2b2..7e8a8459dc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-10 10:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbassert.h
+    ! Fixed to only enable assert()s when HB_BUILD_DEBUG is activated.
+      (So far assert() was disabled for msvcarm only in normal builds.)
+      Pls check me. In some places assert(0) is used which is a permanent
+      exit, so maybe these would need to be replaced with hb_errInternal()?
+
+  * include/assert.ch
+    ! Typo in comment.
+
+  * contrib/make.hbs
+    % Minor opt.
+
 2010-07-10 08:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/gtdos/gtdos.c
   * src/rtl/gtwin/gtwin.c
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index aa28fa4dde..6b332b1156 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -159,10 +159,6 @@ PROCEDURE StandAlone( ... )
       CASE "hbimplib"
          EXIT
       CASE "hbdyn"
-         IF GetEnv( "HB_BUILD_SHARED" ) == "yes"
-            cOptionsPre += " -shared"
-         ENDIF
-         EXIT
       CASE "hbexe"
          IF GetEnv( "HB_BUILD_SHARED" ) == "yes"
             cOptionsPre += " -shared"
diff --git a/harbour/include/assert.ch b/harbour/include/assert.ch
index c340359749..9f17a38ec0 100644
--- a/harbour/include/assert.ch
+++ b/harbour/include/assert.ch
@@ -56,7 +56,7 @@
 
 #ifdef NDEBUG
 
-/* When NDEBUG is definded, ignore all ASSERT() calls */
+/* When NDEBUG is defined, ignore all ASSERT() calls */
 #command ASSERT( <exp> [, <msg>] )      =>
 
 #else
diff --git a/harbour/include/hbassert.h b/harbour/include/hbassert.h
index 18189ae3b1..4959a6a1d6 100644
--- a/harbour/include/hbassert.h
+++ b/harbour/include/hbassert.h
@@ -55,12 +55,12 @@
 
 #include "hbapi.h"
 
-#if defined( HB_OS_WIN_CE ) && defined( _MSC_VER )
+#if ( defined( HB_OS_WIN_CE ) && defined( _MSC_VER ) ) || !defined( HB_TR_LEVEL_DEBUG )
    #ifndef assert
       #define assert(exp)     ((void)0)
    #endif
 #else
    #include <assert.h>
-#endif /* HB_OS_WIN_CE */
+#endif
 
 #endif /* HB_ASSERT_H_ */