diff --git a/backup-manager-purge b/backup-manager-purge
index ce7a67f..5b5072b 100755
--- a/backup-manager-purge
+++ b/backup-manager-purge
@@ -146,14 +146,14 @@ sub parse_archive ($)
     my ($prefix, $name, $date, $master, $filetype);
     $archive = basename ($archive);
 
-    if ($archive =~ m/^\s*($ENV{BM_ARCHIVE_PREFIX})-?(\S+)?\.?(\d{8})\.(master\.)?(\S+)\s*$/) {
+    if ($archive =~ m/^\s*($ENV{BM_ARCHIVE_PREFIX})-?(\S+)?\.?(\d{14})\.(master\.)?(\S+)\s*$/) {
 	($prefix, $name, $date, $master, $filetype) = ($1, $2, $3, $4, $5);
 	$master = $master ? 1 : 0;
 	$name = "$prefix-md5" if $filetype eq 'md5' and not $name;
     }
 
     # The archive pattern
-    elsif ($archive =~ /^\s*([^-]+)-(\S+)\.(\d{8})\.(\S+)\s*$/) {
+    elsif ($archive =~ /^\s*([^-]+)-(\S+)\.(\d{14})\.(\S+)\s*$/) {
         $prefix = $1;
         $name = $2;
         $date = $3;
@@ -169,7 +169,7 @@ sub parse_archive ($)
     }
 
     # The md5 file pattern
-    elsif ($archive =~ /^\s*([^-]+)-(\d{8})\.md5\s*$/) {
+    elsif ($archive =~ /^\s*([^-]+)-(\d{14})\.md5\s*$/) {
         $prefix = $1;
         $name = "$prefix-md5";
         $date = $2;
@@ -238,7 +238,7 @@ sub outdate_archives($$)
         exit E_INTERNAL;
     }
 
-    my $purge_date = strftime ('%Y%m%d', 
+    my $purge_date = strftime ('%Y%m%d%H%M%S',
                                localtime(time() - $g_ttl * 24 * 3600)); 
     print_info "Outdating archives made before $purge_date";
     
diff --git a/backup-manager-upload b/backup-manager-upload
index 192690e..48b6caa 100755
--- a/backup-manager-upload
+++ b/backup-manager-upload
@@ -94,12 +94,12 @@ sub get_formated_date($)
 	}
 
 	if ($date eq 'today') {
-		return strftime ('%Y%m%d', localtime);
+		return strftime ('%Y%m%d%H%M%S', localtime);
 	}
 	elsif ($date eq 'yesterday') {
-		return strftime ('%Y%m%d', localtime(time - (24 * 3600)));
+		return strftime ('%Y%m%d%H%M%S', localtime(time - (24 * 3600)));
 	}
-	elsif ($date =~ /^\d{4}\d{2}\d{2}$/) {
+	elsif ($date =~ /^\d{4}\d{2}\d{2}\d{2}\d{2}\d{2}$/) {
 		return $date;
 	}
 	else {
diff --git a/lib/actions.sh b/lib/actions.sh
index 0d10b70..9ae257c 100644
--- a/lib/actions.sh
+++ b/lib/actions.sh
@@ -168,7 +168,7 @@ function bm_init_env ()
 function bm_init_today()
 {
     debug "bm_init_today()"
-    export TODAY=`date +%Y%m%d`                  
+    export TODAY=`date +%Y%m%d%H%M%S`
 }
 
 # be sure that zip is supported.
diff --git a/lib/files.sh b/lib/files.sh
index 820c782..34a5273 100644
--- a/lib/files.sh
+++ b/lib/files.sh
@@ -201,7 +201,7 @@ function get_date_from_archive()
     file="$1"
     debug "get_date_from_archive ($file)"
 
-    date=$(echo $file | sed -e 's/.*\(20[0-9][0-9][0-9][0-9][0-3][0-9]\).*/\1/')
+    date=$(echo $file | sed -e 's/.*\(20[0-9][0-9][0-9][0-9][0-3][0-9][0-2][0-9][0-5][0-9][0-5][0-9]\).*/\1/')
     echo "$date"
 }