diff --git a/src/burp/backup.epp b/src/burp/backup.epp
index ac3b7fa59f..d3e9887ec9 100644
--- a/src/burp/backup.epp
+++ b/src/burp/backup.epp
@@ -37,7 +37,7 @@
  */
 
 /*
-$Id: backup.epp,v 1.66 2004-10-07 09:19:19 robocop Exp $
+$Id: backup.epp,v 1.67 2004-10-30 05:58:47 robocop Exp $
 */
 
 #include "firebird.h"
@@ -153,7 +153,7 @@ enum backup_capabilities
 	BCK_ods8			= 2048,	// stored procedures & exceptions & constraints
 	BCK_ods9			= 4096,	// SQL roles
 	BCK_ods10			= 8192,	// FIELD_PRECISION
-	BCK_ods11           = 16384 // rdb$description in rdb$roles
+	BCK_ods11           = 16384 // rdb$description in rdb$roles and rdb$generators
 };
 
 #ifdef DEBUG
@@ -1303,7 +1303,9 @@ void put_asciz( const SCHAR attribute, const TEXT* string)
  **************************************/
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	ULONG l = strlen(string);
+	const ULONG l = strlen(string);
+#pragma FB_COMPILER_MESSAGE("CVC: Check that file doesn't exceed 255 in length!")
+	// We'll have to ensure that length < MAX_FILE_NAME_LENGTH
 
 	put(tdgbl, (UCHAR) (attribute));
 	put(tdgbl, (UCHAR) (l));
@@ -3122,24 +3124,54 @@ void write_generators(void)
 
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	FOR (REQUEST_HANDLE req_handle1)
-		X IN RDB$GENERATORS WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
-		put(tdgbl, rec_generator);
-		const SSHORT l = PUT_TEXT (att_gen_generator, X.RDB$GENERATOR_NAME);
-		SINT64 value = 0;
-		if (!tdgbl->gbl_sw_meta) {
-			value = get_gen_id (X.RDB$GENERATOR_NAME, l);
-			put_int64 (att_gen_value_int64, value);
-		}
-		put(tdgbl, att_end);
-		MISC_terminate (X.RDB$GENERATOR_NAME, temp, l, sizeof(temp));
+	if (tdgbl->BCK_capabilities & BCK_ods11)
+	{
+		FOR (REQUEST_HANDLE req_handle1)
+			X IN RDB$GENERATORS
+			WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
+			put(tdgbl, rec_generator);
+			const SSHORT l = PUT_TEXT (att_gen_generator, X.RDB$GENERATOR_NAME);
+			SINT64 value = 0;
+			if (!tdgbl->gbl_sw_meta) {
+				value = get_gen_id (X.RDB$GENERATOR_NAME, l);
+				put_int64 (att_gen_value_int64, value);
+			}
+			if (!X.RDB$DESCRIPTION.NULL) {
+				put_source_blob (att_gen_description, att_gen_description,
+								 &X.RDB$DESCRIPTION);
+			}
+			put(tdgbl, att_end);
+			MISC_terminate (X.RDB$GENERATOR_NAME, temp, l, sizeof(temp));
 #pragma FB_COMPILER_MESSAGE("BRS: casting SINT64 to SLONG")
-		BURP_verbose (165, temp, (void*) (IPTR) value, NULL, NULL, NULL);
-		// msg 165 writing generator %s value %ld
-	END_FOR;
-	ON_ERROR
-		general_on_error();
-	END_ERROR;
+			BURP_verbose (165, temp, (void*) (IPTR) value, NULL, NULL, NULL);
+			// msg 165 writing generator %s value %ld
+		END_FOR;
+		ON_ERROR
+			general_on_error();
+		END_ERROR;
+	}
+	else
+	{
+		FOR (REQUEST_HANDLE req_handle1)
+			X IN RDB$GENERATORS
+			WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
+			put(tdgbl, rec_generator);
+			const SSHORT l = PUT_TEXT (att_gen_generator, X.RDB$GENERATOR_NAME);
+			SINT64 value = 0;
+			if (!tdgbl->gbl_sw_meta) {
+				value = get_gen_id (X.RDB$GENERATOR_NAME, l);
+				put_int64 (att_gen_value_int64, value);
+			}
+			put(tdgbl, att_end);
+			MISC_terminate (X.RDB$GENERATOR_NAME, temp, l, sizeof(temp));
+#pragma FB_COMPILER_MESSAGE("BRS: casting SINT64 to SLONG")
+			BURP_verbose (165, temp, (void*) (IPTR) value, NULL, NULL, NULL);
+			// msg 165 writing generator %s value %ld
+		END_FOR;
+		ON_ERROR
+			general_on_error();
+		END_ERROR;
+	}
 
 	MISC_release_request_silent(req_handle1);
 } 
diff --git a/src/burp/burp.h b/src/burp/burp.h
index 9f676c1418..dd05543273 100644
--- a/src/burp/burp.h
+++ b/src/burp/burp.h
@@ -168,12 +168,15 @@ and trigger-new is:
 /* ATT_BACKUP_FORMAT has been increased to 5. It allows us to distinguish
    backup format between IB3.3/IB4.0 and IB4.5 in case of migration
    problem */
+
 /* Version 6:		Supports SQL Time & Date columns.
 			RDB$FIELD_PRECISION
 			SQL Dialect from database header
 			SQL_INT64 columns and generator values
  */
-const int ATT_BACKUP_FORMAT		= 6;
+ 
+// Version 7: RDB$DESCRIPTION in roles and generators.
+const int ATT_BACKUP_FORMAT		= 7;
 
 // format version number for ranges for arrays 
 
@@ -427,6 +430,7 @@ enum att_type {
 	att_gen_generator = SERIES,
 	att_gen_value,
 	att_gen_value_int64,
+	att_gen_description,
 
 	// Stored procedure attributes 
 
diff --git a/src/burp/restore.epp b/src/burp/restore.epp
index ec8f4962b0..9230e5336d 100644
--- a/src/burp/restore.epp
+++ b/src/burp/restore.epp
@@ -24,7 +24,7 @@
  * 2003.08.17 Claudio Valderrama: Fix SF Bug #750659.
  */
 /*
-$Id: restore.epp,v 1.82 2004-08-30 10:07:00 robocop Exp $
+$Id: restore.epp,v 1.83 2004-10-30 05:58:48 robocop Exp $
 */
 
 #include "firebird.h"
@@ -146,7 +146,7 @@ USHORT	recompute_length (burp_rel*);
 bool	restore (const TEXT*, const TEXT*);
 void	restore_security_class (const TEXT*, const TEXT*);
 USHORT	get_view_base_relation_count(const TEXT*, USHORT);
-void	store_blr_gen_id (const TEXT*, SINT64);
+void	store_blr_gen_id (const TEXT*, SINT64, const ISC_QUAD*);
 void	update_global_field();
 void	update_view_dbkey_lengths();
 void	general_on_error();
@@ -3436,6 +3436,10 @@ bool get_generator()
 	BurpGlobals*	    tdgbl = BurpGlobals::getSpecific();
 
 	skip_init(&scan_next_attr);
+	
+	ISC_QUAD gen_desc = {0, 0};
+	bool got_desc = false;
+	
 	while (skip_scan(&scan_next_attr), get_attribute(&attribute, tdgbl) != att_end)
 	{
 		switch (attribute)
@@ -3454,6 +3458,16 @@ bool get_generator()
 			value = get_int64();
 			break;
 
+			case att_gen_description:
+				if (tdgbl->RESTORE_format >= 7)
+				{
+					get_source_blob (&gen_desc, false);
+					got_desc = gen_desc.gds_quad_high || gen_desc.gds_quad_low;
+				}
+				else
+					bad_attribute(scan_next_attr, attribute, 93);
+				break;
+
 		default:
 			bad_attribute (scan_next_attr, attribute, 93);
 			// msg 93 index
@@ -3461,7 +3475,7 @@ bool get_generator()
 		}
 	}
 
-	store_blr_gen_id (name, value);
+	store_blr_gen_id (name, value, got_desc ? &gen_desc: NULL);
 
 	return true;
 }
@@ -4979,7 +4993,7 @@ bool get_relation_data()
 
 		case rec_gen_id:
 			gen_id = get_numeric();
-			store_blr_gen_id (name, gen_id);
+			store_blr_gen_id (name, gen_id, NULL);
 			get_record(&record, tdgbl);
 			break;
 
@@ -5021,55 +5035,105 @@ bool get_sql_roles()
 
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	STORE (REQUEST_HANDLE tdgbl->handles_get_sql_roles_req_handle1)
-		X IN RDB$ROLES
+	if (tdgbl->RESTORE_format >= 7)
+	{
+		STORE (REQUEST_HANDLE tdgbl->handles_get_sql_roles_req_handle1)
+			X IN RDB$ROLES
 
-		X.RDB$ROLE_NAME.NULL = TRUE;
-		X.RDB$OWNER_NAME.NULL = TRUE;
-		X.RDB$DESCRIPTION.NULL = TRUE;
-		X.RDB$SYSTEM_FLAG.NULL = TRUE;
-		skip_init(&scan_next_attr);
+			X.RDB$ROLE_NAME.NULL = TRUE;
+			X.RDB$OWNER_NAME.NULL = TRUE;
+			X.RDB$DESCRIPTION.NULL = TRUE;
+			X.RDB$SYSTEM_FLAG.NULL = TRUE;
+			skip_init(&scan_next_attr);
 
-		while (skip_scan(&scan_next_attr), get_attribute(&attribute, tdgbl) != att_end)
-		{
-			switch (attribute)
+			while (skip_scan(&scan_next_attr), get_attribute(&attribute, tdgbl) != att_end)
 			{
-			case att_role_name:
-				X.RDB$ROLE_NAME.NULL = FALSE;
-				l = GET_TEXT(X.RDB$ROLE_NAME);
-				MISC_terminate (X.RDB$ROLE_NAME, temp, l, sizeof(temp));
-				/************************************************
-				**
-				** msg 251, restoring SQL role: %s
-				**
-				*************************************************/
-				BURP_verbose (251, temp, NULL, NULL, NULL, NULL);
-				break;
+				switch (attribute)
+				{
+				case att_role_name:
+					X.RDB$ROLE_NAME.NULL = FALSE;
+					l = GET_TEXT(X.RDB$ROLE_NAME);
+					MISC_terminate (X.RDB$ROLE_NAME, temp, l, sizeof(temp));
+					/************************************************
+					**
+					** msg 251, restoring SQL role: %s
+					**
+					*************************************************/
+					BURP_verbose (251, temp, NULL, NULL, NULL, NULL);
+					break;
 
-			case att_role_owner_name:
-				X.RDB$OWNER_NAME.NULL = FALSE;
-				GET_TEXT(X.RDB$OWNER_NAME);
-				break;
-				
-			case att_role_description:
-				get_source_blob (&X.RDB$DESCRIPTION, false);
-				X.RDB$DESCRIPTION.NULL = FALSE;
-			    break;
+				case att_role_owner_name:
+					X.RDB$OWNER_NAME.NULL = FALSE;
+					GET_TEXT(X.RDB$OWNER_NAME);
+					break;
 
-			default:
-				/*************************************************
-				**
-				** msg 250, Bad attribute for restoring SQL role
-				**
-				**************************************************/
-				bad_attribute (scan_next_attr, attribute, 250);
-				break;
+				case att_role_description:
+					get_source_blob (&X.RDB$DESCRIPTION, false);
+					X.RDB$DESCRIPTION.NULL = FALSE;
+				    break;
+
+				default:
+					/*************************************************
+					**
+					** msg 250, Bad attribute for restoring SQL role
+					**
+					**************************************************/
+					bad_attribute (scan_next_attr, attribute, 250);
+					break;
+				}
 			}
-		}
-	END_STORE
-	ON_ERROR
-		general_on_error ();
-	END_ERROR;
+		END_STORE
+		ON_ERROR
+			general_on_error ();
+		END_ERROR;
+	}
+	else
+	{
+		STORE (REQUEST_HANDLE tdgbl->handles_get_sql_roles_req_handle1)
+			X IN RDB$ROLES
+
+			X.RDB$ROLE_NAME.NULL = TRUE;
+			X.RDB$OWNER_NAME.NULL = TRUE;
+			X.RDB$DESCRIPTION.NULL = TRUE;
+			X.RDB$SYSTEM_FLAG.NULL = TRUE;
+			skip_init(&scan_next_attr);
+
+			while (skip_scan(&scan_next_attr), get_attribute(&attribute, tdgbl) != att_end)
+			{
+				switch (attribute)
+				{
+				case att_role_name:
+					X.RDB$ROLE_NAME.NULL = FALSE;
+					l = GET_TEXT(X.RDB$ROLE_NAME);
+					MISC_terminate (X.RDB$ROLE_NAME, temp, l, sizeof(temp));
+					/************************************************
+					**
+					** msg 251, restoring SQL role: %s
+					**
+					*************************************************/
+					BURP_verbose (251, temp, NULL, NULL, NULL, NULL);
+					break;
+
+				case att_role_owner_name:
+					X.RDB$OWNER_NAME.NULL = FALSE;
+					GET_TEXT(X.RDB$OWNER_NAME);
+					break;
+
+				default:
+					/*************************************************
+					**
+					** msg 250, Bad attribute for restoring SQL role
+					**
+					**************************************************/
+					bad_attribute (scan_next_attr, attribute, 250);
+					break;
+				}
+			}
+		END_STORE
+		ON_ERROR
+			general_on_error ();
+		END_ERROR;
+	}
 
 	return true;
 }
@@ -5083,7 +5147,7 @@ bool is_ascii_name (const TEXT *name, const SSHORT len)
  **************************************
  *
  * Functional description
- *	Check if the input text is valid ASCII name
+ *	Check if the input text is valid ASCII uppercased name
  *
  **************************************/
 	SSHORT i = 0;
@@ -6736,7 +6800,8 @@ USHORT get_view_base_relation_count (const TEXT* current_view_name,
 
 
 void store_blr_gen_id (const TEXT*	gen_name,	// TEXT GDS_NAME[GDS_NAME_LEN]
-					   SINT64	value)
+					   SINT64	value,
+					   const ISC_QUAD* gen_desc)
 {
 /**************************************
  *
@@ -6750,13 +6815,32 @@ void store_blr_gen_id (const TEXT*	gen_name,	// TEXT GDS_NAME[GDS_NAME_LEN]
  **************************************/
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	STORE (REQUEST_HANDLE tdgbl->handles_store_blr_gen_id_req_handle1)
-		X IN RDB$GENERATORS
-		strcpy (X.RDB$GENERATOR_NAME, gen_name);
-	END_STORE;
-	ON_ERROR
-		general_on_error ();
-	END_ERROR;
+	if (tdgbl->RESTORE_format >= 7)
+	{
+		STORE (REQUEST_HANDLE tdgbl->handles_store_blr_gen_id_req_handle1)
+			X IN RDB$GENERATORS
+			strcpy (X.RDB$GENERATOR_NAME, gen_name);
+			X.RDB$DESCRIPTION.NULL = TRUE;
+			if (gen_desc)
+			{
+				X.RDB$DESCRIPTION = *gen_desc;
+				X.RDB$DESCRIPTION.NULL = FALSE;
+			}
+		END_STORE;
+		ON_ERROR
+			general_on_error ();
+		END_ERROR;
+	}
+	else
+	{
+		STORE (REQUEST_HANDLE tdgbl->handles_store_blr_gen_id_req_handle1)
+			X IN RDB$GENERATORS
+			strcpy (X.RDB$GENERATOR_NAME, gen_name);
+		END_STORE;
+		ON_ERROR
+			general_on_error ();
+		END_ERROR;
+	}
 
 	if (!value)
 	{