diff --git a/jhalfs b/jhalfs
index 07956ba..07e6796 100755
--- a/jhalfs
+++ b/jhalfs
@@ -51,6 +51,9 @@ Options:
                                 also disables the build of TCL, Expect
                                 and DejaGNU
 
+  --no-strip                    don't run the strip command on both the
+                                temporary system and the final system
+
   --timezone TIMEZONE           set TIMEZONE as the local timezone. If not
                                 specified, \"Europe/London\" will be used.
 
@@ -359,6 +362,11 @@ chapter5_Makefiles() {
       fi
     fi
 
+    # Test if the stripping phase must be skipped
+    if [ "$STRIP" = "0" ] && [[ `_IS_ $i stripping` ]] ; then
+      continue
+    fi
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter5="$chapter5 $i"
@@ -515,6 +523,11 @@ chapter6_Makefiles() {
        continue
     fi
 
+    # Test if the stripping phase must be skipped
+    if [ "$STRIP" = "0" ] && [[ `_IS_ $i stripping` ]] ; then
+      continue
+    fi
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter6="$chapter6 $i"
@@ -935,6 +948,8 @@ while test $# -gt 0 ; do
 
     --no-toolchain-test )	TOOLCHAINTEST=0 ;;
 
+    --no-strip )	STRIP=0 ;;
+
     --no-vim-lang )	VIMLANG=0 ;;
     
     --page_size )
diff --git a/jhalfs.conf b/jhalfs.conf
index eefa1a6..aac97a0 100644
--- a/jhalfs.conf
+++ b/jhalfs.conf
@@ -23,6 +23,9 @@ TEST=0
 #--- Run the toolchain tests  0(no)/1(yes)
 TOOLCHAINTEST=1
 
+#--- Run the stripping phases  0(no)/1(yes)
+STRIP=1
+
 #--- page definition for groff letter/A4
 PAGE=letter