diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index ed5c99a..770eb34 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -145,13 +145,16 @@ function check_rebuild() {
     eval $(${BEEVERSION} ${beefile})
 
     beefile_pattern="${PKGFULLNAME}-${PKGFULLVERSION}"
+    beefile_pattern=${beefile_pattern//+/\\+} # replace all + with \+
+    beefile_pattern=${beefile_pattern//./\\.} # replace all . with \.
+
     beefile_max=$(for bf in $(ls ${beefile%/*}/${beefile_pattern}*.bee ${BEE_BEEDIR}/${beefile_pattern}*.bee 2>/dev/null |\
                               grep -E "/${beefile_pattern}-[0-9]+.bee") ; do
                       echo "${bf}"
                   done | ${BEESORT} | tail -1)
 
     eval $(${BEEVERSION} ${beefile_max})
-    print_warning "cp ${beefile} ${PWD}/${beefile_pattern}-$((PKGREVISION + 1)).bee"
+    print_warning "cp ${beefile} ${PWD}/${PKGFULLNAME}-${PKGFULLVERSION}-$((PKGREVISION + 1)).bee"
 
     exit 1
 }