diff --git a/ChangeLog b/ChangeLog
index e6c9324e..f55c55e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-08  Curtis Gedak  <gedakc@gmail.com>
+
+	* src/Dialog_Partition_Label.cc: Increase dialog box size
+
+	* src/linux_swap.cc: Enhanced to work with different versions of vol_id
+
 2008-04-07  Marcel Telka  <marcel@telka.sk>
 
 	* MAINTAINERS: New file (bug #524276).
@@ -271,7 +277,7 @@
 2007-01-07 Bart Hakvoort <hakvoort@cvs.gnome.org>
 
 	* src/GParted_Core.cc: added a check to see wether a device is 'real'
-	  or not. (thanks to François Dupoux for the patch)
+	  or not. (thanks to Fran�ois Dupoux for the patch)
 
 2006-12-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
diff --git a/src/Dialog_Partition_Label.cc b/src/Dialog_Partition_Label.cc
index 910b3e2a..d50890aa 100644
--- a/src/Dialog_Partition_Label.cc
+++ b/src/Dialog_Partition_Label.cc
@@ -26,7 +26,7 @@ Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition )
 
 	this ->set_resizable( false ) ;
 	this ->set_has_separator( false ) ;
-	this ->set_size_request( 300, 70 ) ;
+	this ->set_size_request( 300, 80 ) ;
 	
 	/*TO TRANSLATORS: dialog title, looks like Set partition label on /dev/hda3 */
 	this ->set_title( String::ucompose( _("Set partition label on %1"), partition .get_path() ) );
diff --git a/src/linux_swap.cc b/src/linux_swap.cc
index 698151ac..6a525e20 100644
--- a/src/linux_swap.cc
+++ b/src/linux_swap.cc
@@ -48,9 +48,9 @@ void linux_swap::set_used_sectors( Partition & partition )
 
 void linux_swap::get_label( Partition & partition )
 {
-	if ( ! Utils::execute_command( "vol_id --label-raw " + partition .get_path(), output, error, true ) )
+	if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
 	{
-		partition .label = Utils::regexp_label( output, "^(.*)" ) ;
+		partition .label = Utils::regexp_label( output, "ID_FS_LABEL=([^\n]*)" ) ;
 	}
 	else
 	{