diff --git a/bacula-backup/CHANGELOG b/bacula-backup/CHANGELOG
index 73ab4b4da..a8853adb0 100644
--- a/bacula-backup/CHANGELOG
+++ b/bacula-backup/CHANGELOG
@@ -9,3 +9,4 @@ Backup schedules with Level= and Pool= tags are now properly displayed and edita
 Added a missing program so that mass deletion of storage devices works.
 ---- Changes since 1.490 ----
 Fixed fileset exlude list and 'Run at times' display, thanks to a patch by Joe Zhou.
+Added support for automatic volume labelling and max volume size, thanks to Caspar Smit.
diff --git a/bacula-backup/edit_pool.cgi b/bacula-backup/edit_pool.cgi
index 4b4e0ea27..0e92831e6 100755
--- a/bacula-backup/edit_pool.cgi
+++ b/bacula-backup/edit_pool.cgi
@@ -68,6 +68,11 @@ if (&get_bacula_version_cached() < 2) {
 	print &ui_table_row($text{'pool_any'},
 			    &bacula_yesno("any", "Accept Any Volume", $mems));
 	}
+print &ui_table_row($text{'pool_autolabel'},
+	&ui_textbox("autolabel", $name=&find_value("LabelFormat", $mems), 20), 3);
+print &ui_table_row($text{'pool_maxvolsize'},
+	&ui_textbox("maxvolsize", $name=&find_value("Maximum Volume Bytes", $mems), 10), 3);
+
 
 # All done
 print &ui_table_end();
diff --git a/bacula-backup/lang/en b/bacula-backup/lang/en
index 558c489ab..ce5f34fa0 100644
--- a/bacula-backup/lang/en
+++ b/bacula-backup/lang/en
@@ -342,6 +342,8 @@ pool_echild=This client cannot be deleted as it is used by $1
 pool_emax=Missing or invalid maximum number of jobs per volume
 pool_ereten=Missing or invalid retention period
 pool_status=Show Volumes
+pool_autolabel=Automatically label volumes prefix
+pool_maxvolsize=Maximum volume size (e.g. 5G for 5 Gigabytes)
 
 poolstatus_title=Volumes In Pool
 poolstatus_show=Show volumes in pool:
diff --git a/bacula-backup/save_pool.cgi b/bacula-backup/save_pool.cgi
index 48f411bde..e7d8da333 100755
--- a/bacula-backup/save_pool.cgi
+++ b/bacula-backup/save_pool.cgi
@@ -64,6 +64,9 @@ else {
 		&save_directive($conf, $pool, "Accept Any Volume",
 				$in{'any'} || undef, 1);
 		}
+ 	&save_directive($conf, $pool, "LabelFormat", $in{'autolabel'} || undef, 1);
+	&save_directive($conf, $pool, "Maximum Volume Bytes", $in{'maxvolsize'} || undef, 1);
+
 
 	# Create or update
 	if ($in{'new'}) {