diff --git a/ChangeLog b/ChangeLog
index 110dad48..433b97b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-26 Bart Hakvoort <hakvoort@cvs.gnome.org>
+
+	* src/GParted_Core.cc: sort devices alphabetically by default.
+
 2006-03-25 Bart Hakvoort <hakvoort@cvs.gnome.org>
 
 	* src/DrawingAreaVisualDisk.cc: prevented a possible segfault at
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index aefb4b0a..ed1f2c00 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -140,8 +140,9 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
 			lp_device = ped_device_get_next( lp_device ) ;
 		}
 		close_device_and_disk() ;
-	}
 
+		std::sort( device_paths .begin(), device_paths .end() ) ;
+	}
 	
 	for ( unsigned int t = 0 ; t < device_paths .size() ; t++ ) 
 	{