diff --git a/pack b/pack
index 71c32ca..af8c003 100755
--- a/pack
+++ b/pack
@@ -42,9 +42,10 @@ for BRANCH in $TRUNK $BRANCHES; do
 		bfile=`basename $file`
 		echo -n "Processing catalog $bfile... ";
 		d=`echo "$bfile" | sed "s/.$LCODE.po//"`
-		$MSGMERGE --silent $file -U $file
+		$MSGMERGE --no-wrap --silent $file $file -o $file.temp
 		if [ -f "$BRANCH/$d/$LCODE.po" ]; then
-			if ! $DIFF -q "$file" "$BRANCH/$d/$LCODE.po"  > /dev/null ; then
+			$MSGMERGE --no-wrap --silent "$BRANCH/$d/$LCODE.po" "$BRANCH/$d/$LCODE.po" -o "$BRANCH/$d/$LCODE.po.temp"
+			if ! $DIFF -q "$file.temp" "$BRANCH/$d/$LCODE.po.temp"  > /dev/null ; then
 				mkdir "$LCODE-temp/$d"
 	        		cp "$file" "$LCODE-temp/$d/$LCODE.po"
 				echo -e $GREEN"OK"$ENDCOLOR
@@ -52,6 +53,8 @@ for BRANCH in $TRUNK $BRANCHES; do
 			else
 				echo -e $BLUE"Skipping"$ENDCOLOR
 			fi
+			rm $file.temp
+			rm "$BRANCH/$d/$LCODE.po.temp"
 		else
 			mkdir -p "$LCODE-temp/$d"
 	        	cp "$file" "$LCODE-temp/$d/$LCODE.po"