diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 45cfe76518..cff1868e71 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-04 12:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbatomic.h
+    * added two new build time macros which can be used to control
+      using GCC atomic builtin functions changing the default settings.
+         HB_USE_GCCATOMIC_OFF - disable using atomic builtins
+         HB_USE_GCCATOMIC     - force using atomic builtins
+
+  - harbour/src/pp/hbpp.1
+  + harbour/examples/pp/pp.1
+    ! moved man files for old harbour preprocessor to correct place
+
+  + harbour/src/pp/hbpp.1
+    + added new man file for current hbpp
+
 2010-09-03 21:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/utils/hbqtgen.prg
     + Implemented: QIcon() as a parameter now can be supplied as 
diff --git a/harbour/examples/pp/pp.1 b/harbour/examples/pp/pp.1
new file mode 100644
index 0000000000..b5bc573c27
--- /dev/null
+++ b/harbour/examples/pp/pp.1
@@ -0,0 +1,30 @@
+.TH HBPP 1
+
+.SH NAME
+hbpp \- Harbour Project Preprocessor
+
+.SH SYNOPSIS
+\fBhbpp\fP \fB<file[.prg]>\fP \fB[options]\fP
+
+.SH DESCRIPTION
+\fBhbpp\fP is the old Harbour Project preprocessor.
+
+.SH OPTIONS
+.IP "\fB-d<id>[=<val>]\fP" 10
+#define <id>
+.IP "\fB-i<path>\fP" 10
+add #include file search path
+.IP "\fB-o\fP" 10
+creates hbpp.out with all tables
+.IP "\fB-n\fP" 10
+with those only, which defined in your file
+.IP "\fB-w\fP" 10
+enable warnings
+
+
+.SH AUTHOR
+
+Author of hbpp: The Harbour Project (http://harbour-project.org)
+
+This manual page was written by Luis Mayoral <mayoral@linuxadicto.org>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/harbour/include/hbatomic.h b/harbour/include/hbatomic.h
index 1674c47483..617e3ce089 100644
--- a/harbour/include/hbatomic.h
+++ b/harbour/include/hbatomic.h
@@ -91,6 +91,13 @@ HB_EXTERN_BEGIN
 /* Inline assembler version of atomic operations on memory reference counters */
 #if defined( __GNUC__ )
 
+#  if defined( HB_USE_GCCATOMIC_OFF )
+#     undef HB_USE_GCCATOMIC
+#  elif ( ( __GNUC__ > 4 ) || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 1) ) && \
+        !defined( __MINGW32CE__ ) && !defined( HB_USE_GCCATOMIC )
+#     define HB_USE_GCCATOMIC
+#  endif
+
 #  if defined( HB_CPU_X86 ) || defined( HB_CPU_X86_64 )
 
 #     if HB_COUNTER_SIZE == 4
@@ -184,9 +191,7 @@ HB_EXTERN_BEGIN
 #     define HB_SPINLOCK_RELEASE(l) hb_spinlock_release(l)
 #     define HB_SPINLOCK_ACQUIRE(l) hb_spinlock_acquire(l)
 
-
-#  elif ( ( __GNUC__ > 4 ) || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 1) ) && \
-        !defined( __MINGW32CE__ )
+#  elif defined( HB_USE_GCCATOMIC )
 
 #     define HB_ATOM_INC( p )       __sync_add_and_fetch( (p), 1 )
 #     define HB_ATOM_DEC( p )       __sync_sub_and_fetch( (p), 1 )
diff --git a/harbour/src/pp/hbpp.1 b/harbour/src/pp/hbpp.1
index b5bc573c27..8d5c74c579 100644
--- a/harbour/src/pp/hbpp.1
+++ b/harbour/src/pp/hbpp.1
@@ -1,30 +1,46 @@
+.\" $Id$
 .TH HBPP 1
 
 .SH NAME
-hbpp \- Harbour Project Preprocessor
+hbpp \- Harbour Preprocessor
 
 .SH SYNOPSIS
-\fBhbpp\fP \fB<file[.prg]>\fP \fB[options]\fP
+.B hbpp
+.RI \fR\fI<file\fP[\fR\fI.prg\fP]\fR\fI>\fP
+[
+.I options
+]
 
 .SH DESCRIPTION
-\fBhbpp\fP is the old Harbour Project preprocessor.
+\fBhbpp\fP is fully functional standalone Harbour preprocessor
+which can be used to preprocess any files but also to generate
+C source code with preprocesor rules defined in given files.
 
 .SH OPTIONS
-.IP "\fB-d<id>[=<val>]\fP" 10
-#define <id>
-.IP "\fB-i<path>\fP" 10
+.IP "\fB\-d\fR\fI<id>\fP[\fB=\fR\fI<val>\fP]" 16
+#define \fR\fI<id>\fP
+.IP "\fB-i\fR\fI<path>\fP" 16
 add #include file search path
-.IP "\fB-o\fP" 10
-creates hbpp.out with all tables
-.IP "\fB-n\fP" 10
-with those only, which defined in your file
-.IP "\fB-w\fP" 10
-enable warnings
+.IP "\fB-u\fP[\fR\fI<file>\fP]" 16
+use command def set in \fR\fI<file>\fP (or none)
+.IP "\fB-c\fP[\fR\fI<file>\fP]" 16
+look for ChangeLog file to extract version information
+.IP "\fB-o\fR\fI<file>\fP" 16
+creates .c file with PP rules
+.IP "\fB-v\fR\fI<file>\fP" 16
+creates .h file with version information
+.IP "\fB-w\fP" 16
+write preprocessed (.ppo) file
+.IP "\fB-q\fP[\fB012\fP]" 16
+disable information messages
+.PP
+If neither -o nor -v is specified then -w is default action.
 
+.SH "ENVIRONMENT VARIABLES"
+.IP "\fBINCLUDE\fR"
+The value of \fB\s-1INCLUDE\s0\fR is a colon-separated list of
+directories, much like shell's \fB\s-1PATH\s0\fR. It's used by
+\fBhbpp\fR as default search paths for included files.
 
 .SH AUTHOR
-
-Author of hbpp: The Harbour Project (http://harbour-project.org)
-
-This manual page was written by Luis Mayoral <mayoral@linuxadicto.org>,
-for the Debian GNU/Linux system (but may be used by others).
+Przemyslaw Czerpak, The Harbour Project (http://harbour-project.org)