diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 385f846fcf..41b9cd6c94 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-27 23:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - package/debian
+  + debian
+  * INSTALL
+    * Moved back to root. Seems like this MUST be in root and there
+      is no way to tell debhelper tools otherwise.
+
+  * debian/rules
+    % Deleted unnecessary stuff. Pls review me.
+
+  * config/global.mk
+    ! Minor in comments.
+
 2010-07-27 22:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/postinst.hbs
     + Added more feedback.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index e900b38c4c..46a642b62e 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -224,7 +224,7 @@ HARBOUR
    Binary .deb on Linux
    --------------------
 
-      $ fakeroot package/debian/rules binary
+      $ fakeroot debian/rules binary
 
    Binary .rpm on Linux
    --------------------
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 558db9b450..b6361408a3 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1464,12 +1464,12 @@ ifeq ($(HB_BUILD_PKG),yes)
 
       # HB_TOP             - dir where packages will be created (root of Harbour source tree)
       # HB_INSTALL_PKG_TOP - dir which has to be packed
-      # HB_PKGNAME         - name of the install package on non-*nix
+      # HB_PKGNAME         - name of the install package
       # HB_INSTALL_PREFIX  - dir where Harbour dirs will be created
       #
-      #   <HB_TOP><plat/comp ><HB_PKGNAME>
+      #   <HB_TOP><plat/comp ><HB_BUILD_PKG_PREFIX>
       #   <HB_INSTALL_PKG_TOP>
-      #   <HB_INSTALL_PREFIX             >
+      #   <HB_INSTALL_PREFIX                      >
       #
 
       ifneq ($(HB_SRC_ROOTPATH),)
diff --git a/harbour/package/debian/changelog b/harbour/debian/changelog
similarity index 100%
rename from harbour/package/debian/changelog
rename to harbour/debian/changelog
diff --git a/harbour/package/debian/compat b/harbour/debian/compat
similarity index 100%
rename from harbour/package/debian/compat
rename to harbour/debian/compat
diff --git a/harbour/package/debian/control b/harbour/debian/control
similarity index 100%
rename from harbour/package/debian/control
rename to harbour/debian/control
diff --git a/harbour/package/debian/copyright b/harbour/debian/copyright
similarity index 100%
rename from harbour/package/debian/copyright
rename to harbour/debian/copyright
diff --git a/harbour/package/debian/dirs b/harbour/debian/dirs
similarity index 100%
rename from harbour/package/debian/dirs
rename to harbour/debian/dirs
diff --git a/harbour/package/debian/rules b/harbour/debian/rules
similarity index 80%
rename from harbour/package/debian/rules
rename to harbour/debian/rules
index 59b6db12ab..fb420ff2fa 100755
--- a/harbour/package/debian/rules
+++ b/harbour/debian/rules
@@ -11,19 +11,9 @@ export HB_LIB_INSTALL := $(CURDIR)/debian/harbour/usr/lib/harbour
 export HB_INC_INSTALL := $(CURDIR)/debian/harbour/usr/include/harbour
 export HB_DOC_INSTALL := $(CURDIR)/debian/harbour/usr/share/doc/harbour
 export HB_ETC_INSTALL := $(CURDIR)/debian/harbour/etc/harbour
-
-# is INSTDIR necessary for dpkg? If not then please remove it.
-export INSTDIR := $(CURDIR)/debian/harbour
-
+export HB_BUILD_PKG := no
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-   HB_USER_CFLAGS += -O0
-else
-   HB_USER_CFLAGS += -O3
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
-else
-   HB_USER_CFLAGS := -g
+   export HB_BUILD_OPTIM := no
 endif
 
 build: build-stamp
@@ -51,7 +41,6 @@ install: build
 	dh_installdirs
 
 	make install
-	install -m644 src/rtl/gtcrs/hb-charmap.def $(HB_ETC_INSTALL)/hb-charmap.def
 
 
 # Build architecture-independent files here.