diff --git a/config/20-makedist-autobuild b/config/20-makedist-autobuild
index 5229188..fab11f9 100755
--- a/config/20-makedist-autobuild
+++ b/config/20-makedist-autobuild
@@ -269,7 +269,15 @@ sizeArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTSIZE';
 md5Array['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTMD5';
 builddateArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTBUILDDATE';
 _EOF
-
+            # create short links used e.g. by unetbootin
+            if [ -e $DESTDIR/$DESTNAME ]; then
+               if [ "$DISTVERSION" = "devel" ]; then
+                  ln -sf $DESTNAME $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l-snapshot.${a}.${MEDIUMSUFFIX}
+               else
+                  ln -sf $DESTNAME $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l-$DISTVERSION.${a}.${MEDIUMSUFFIX}
+               fi
+               rm -f $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}
+            fi
          fi
          DIST_DWD="$DIST_DWD<option value=\"/download.html?file=$DESTBASEURL/$PRODNAME/$l/$DESTNAME\">${mediumlang} $fortext $archtext</option>"
 #         DIST_DWD="$DIST_DWD <a href=\"/download.html?file=$DESTBASEURL/$PRODNAME/$l/$DESTNAME\">${l}-${a}</a>"