diff --git a/packaging/win32/build_tags.sh b/packaging/win32/build_tags.sh
index 98037dfbf8..730027418a 100644
--- a/packaging/win32/build_tags.sh
+++ b/packaging/win32/build_tags.sh
@@ -25,12 +25,12 @@ svn update
 # If we don't have a tagfile then start from 'now'
 tagfile=tags
 if [ ! -f ${tagfile} ] ; then
-  svn ls ${TAG_URL} > ${tagfile}
+  svn ls -v ${TAG_URL} |  awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}
 fi
 
 # Figure out the new set of tags
-svn ls ${TAG_URL} > ${tagfile}.new
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
+svn ls -v ${TAG_URL} |  awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}.new
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
 
 # move the new file into place
 mv -f ${tagfile}.new ${tagfile}
@@ -38,9 +38,11 @@ mv -f ${tagfile}.new ${tagfile}
 ################################################################
 # Now iterate over all the new tags (if any) and build a package
 
-for tag in $tags ; do
+for tag_rev in $tags ; do
+  tag=${tag_rev%/*}
   tagbasedir=/c/soft/gnucash-${tag}
   tagdir=${tagbasedir}/gnucash
+  rm -fr $tagbasedir
   mkdir -p ${tagdir}
 
   # Copy the downloads to save time