diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e32b6c944f..f93e264245 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-21 14:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour-win-spec
+  * harbour-wce-spec
+    % Deleted some unnecessary lines (related to strip feature)
+
+  * harbour.spec
+    * HB_INC_* -> HB_WITH_*
+
 2009-09-21 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * harbour-win-spec
   * harbour-wce-spec
diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec
index 9814ae7766..51795f8934 100644
--- a/harbour/harbour-wce-spec
+++ b/harbour/harbour-wce-spec
@@ -28,15 +28,9 @@
 %define version   2.0.0
 %define releasen  beta3
 %define hb_pref   hbce
-%define hb_ccpath /opt/mingw32ce/bin
-%define hb_ccpref arm-wince-mingw32ce-
 %define hb_host   www.harbour-project.org
 %define readme    README.RPM
 
-# Workaround for the problem of /usr/bin/strip not handling PE binaries.
-%define __strip   %{hb_ccpath}/%{hb_ccpref}strip
-%define __objdump %{hb_ccpath}/%{hb_ccpref}objdump
-
 ######################################################################
 ## Preamble.
 ######################################################################
diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec
index e47a690449..684c16560d 100644
--- a/harbour/harbour-win-spec
+++ b/harbour/harbour-win-spec
@@ -28,15 +28,9 @@
 %define version   2.0.0
 %define releasen  beta3
 %define hb_pref   hbw
-%define hb_ccpath /opt/xmingw/bin
-%define hb_ccpref i386-mingw-
 %define hb_host   www.harbour-project.org
 %define readme    README.RPM
 
-# Workaround for the problem of /usr/bin/strip not handling PE binaries.
-%define __strip   %{hb_ccpath}/%{hb_ccpref}strip
-%define __objdump %{hb_ccpath}/%{hb_ccpref}objdump
-
 ######################################################################
 ## Preamble.
 ######################################################################
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 7e339d868d..749db5d592 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -73,10 +73,10 @@
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export HB_USER_CFLAGS=
 %define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}"
-%define hb_gpm   export HB_INC_GPM=%{!?_without_gpm:yes}%{?_without_gpm:no}
-%define hb_crs   export HB_INC_CURSES=%{!?_without_gtcrs:yes}%{?_without_gtcrs:no}
-%define hb_sln   export HB_INC_SLANG=%{!?_without_gtsln:yes}%{?_without_gtsln:no}
-%define hb_x11   export HB_INC_X11=%{!?_without_x11:yes}%{?_without_x11:no}
+%define hb_gpm   export HB_WITH_GPM=%{!?_without_gpm:yes}%{?_without_gpm:no}
+%define hb_crs   export HB_WITH_CURSES=%{!?_without_gtcrs:yes}%{?_without_gtcrs:no}
+%define hb_sln   export HB_WITH_SLANG=%{!?_without_gtsln:yes}%{?_without_gtsln:no}
+%define hb_x11   export HB_WITH_X11=%{!?_without_x11:yes}%{?_without_x11:no}
 %define hb_bdir  export HB_BIN_INSTALL=%{_bindir}
 %define hb_idir  export HB_INC_INSTALL=%{_includedir}/%{name}
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}