diff --git a/functions/functions b/functions/functions
index ec6a09c..4163355 100644
--- a/functions/functions
+++ b/functions/functions
@@ -258,6 +258,11 @@ UnPack() {
 
 ArchiveName() {
 	FILENAME=$1
+	if [ "$2" ]; then
+		FLAG=$2
+	else
+		FLAG=""
+	fi
 
 	SUFFIX=`GetSuffix $FILENAME`
 	BASENAME=`echo $FILENAME|sed -e "s/\.$SUFFIX.*$//"`
@@ -266,8 +271,12 @@ ArchiveName() {
 		BASENAME=`echo $BASENAME|sed -e "s/\.$SUFFIX.*$//"`
 	fi
 	BASENAME=`basename $BASENAME`
-	ARCHIVENAME=`echo $BASENAME|sed -e "s/src/bin/"|sed -e "s/SRC/BIN/"| \
-	             sed -e "s/source/binary/"|sed -e "s/SOURCE/BINARY/"`
+	if [ ! "$FLAG" ]; then
+		ARCHIVENAME=`echo $BASENAME|sed -e "s/src/bin/"|sed -e "s/SRC/BIN/"| \
+		             sed -e "s/source/binary/"|sed -e "s/SOURCE/BINARY/"`
+	else
+		ARCHIVENAME=$BASENAME
+	fi
 	echo $ARCHIVENAME.tbz
 }
 
diff --git a/genpkg b/genpkg
index a73d4e5..439304e 100755
--- a/genpkg
+++ b/genpkg
@@ -159,7 +159,11 @@ pkggen() {
 	if [ "$FORCEMAKE" == "1" ]; then
 		(( MKPKG = $MKPKG | 1 ))
 	fi
-	PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+	if [ "$NoRewriteName" == "true" ]; then
+		PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
+	else
+		PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+	fi
 	DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
 	MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
 	
@@ -697,7 +701,11 @@ if [ ! "$C_FLAG" == "0" ]; then
 			PKGGENOPT=""
 		else
 			source $MODULE
-			PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+			if [ "$NoRewriteName" == "true" ]; then
+				PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
+			else
+				PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+			fi
 			DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
 			MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
 			if [ "$DEINSTALL" == "1" ]; then
@@ -709,7 +717,11 @@ if [ ! "$C_FLAG" == "0" ]; then
 			fi
 			if [ "$INSTALL" == "1" ]; then
 				PROGNAME=`basename $MODULE`
-				PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+				if [ "$NoRewriteName" == "true" ]; then
+					PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
+				else
+					PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
+				fi
 				(( CHECKFLAGS = $MKPKG & 256 ))
 				if [ "$CHECKFLAGS" == "0" ]; then
 					INSTALLOPTS="-o"