diff --git a/ChangeLog b/ChangeLog
index 85e9f3ff74..91236991ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-03  Björn Lindqvist  <bjourne@gmail.com>
+
+	Bug 540379 – gtk_tree_view_enable_model_drag_dest and
+	gtk_tree_view_enable_model_drag_source unsets reorderable property
+
+	* gtk/gtktreeview.c: Improve docstrings regarding reorderable
+	property.
+
 2008-08-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkapplaunchcontext-x11.c: Support GEmblemedIcon.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3290638ff3..ce3d22d09b 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12452,12 +12452,15 @@ gtk_tree_view_get_reorderable (GtkTreeView *tree_view)
  * @tree_view: A #GtkTreeView.
  * @reorderable: %TRUE, if the tree can be reordered.
  *
- * This function is a convenience function to allow you to reorder models that
- * support the #GtkDragSourceIface and the #GtkDragDestIface.  Both
- * #GtkTreeStore and #GtkListStore support these.  If @reorderable is %TRUE, then
- * the user can reorder the model by dragging and dropping rows.  The
- * developer can listen to these changes by connecting to the model's
- * row_inserted and row_deleted signals.
+ * This function is a convenience function to allow you to reorder
+ * models that support the #GtkDragSourceIface and the
+ * #GtkDragDestIface.  Both #GtkTreeStore and #GtkListStore support
+ * these.  If @reorderable is %TRUE, then the user can reorder the
+ * model by dragging and dropping rows. The developer can listen to
+ * these changes by connecting to the model's row_inserted and
+ * row_deleted signals. The reordering is implemented by setting up
+ * the tree view as a drag source and destination. Therefore, drag and
+ * drop can not be used in a reorderable view for any other purpose.
  *
  * This function does not give you any degree of control over the order -- any
  * reordering is allowed.  If more control is needed, you should probably
@@ -13340,8 +13343,9 @@ unset_reorderable (GtkTreeView *tree_view)
  * @n_targets: the number of items in @targets
  * @actions: the bitmask of possible actions for a drag from this
  *    widget
- * 
- * Turns @tree_view into a drag source for automatic DND.
+ *
+ * Turns @tree_view into a drag source for automatic DND. Calling this
+ * method sets reorderable to %FALSE.
  **/
 void
 gtk_tree_view_enable_model_drag_source (GtkTreeView              *tree_view,
@@ -13377,7 +13381,8 @@ gtk_tree_view_enable_model_drag_source (GtkTreeView              *tree_view,
  * @actions: the bitmask of possible actions for a drag from this
  *    widget
  * 
- * Turns @tree_view into a drop destination for automatic DND.
+ * Turns @tree_view into a drop destination for automatic DND. Calling
+ * this method sets reorderable to %FALSE.
  **/
 void
 gtk_tree_view_enable_model_drag_dest (GtkTreeView              *tree_view,
@@ -13404,8 +13409,10 @@ gtk_tree_view_enable_model_drag_dest (GtkTreeView              *tree_view,
 /**
  * gtk_tree_view_unset_rows_drag_source:
  * @tree_view: a #GtkTreeView
- * 
- * Undoes the effect of gtk_tree_view_enable_model_drag_source().
+ *
+ * Undoes the effect of
+ * gtk_tree_view_enable_model_drag_source(). Calling this method sets
+ * reorderable to %FALSE.
  **/
 void
 gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
@@ -13434,8 +13441,10 @@ gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
 /**
  * gtk_tree_view_unset_rows_drag_dest:
  * @tree_view: a #GtkTreeView
- * 
- * Undoes the effect of gtk_tree_view_enable_model_drag_dest().
+ *
+ * Undoes the effect of
+ * gtk_tree_view_enable_model_drag_dest(). Calling this method sets
+ * reorderable to %FALSE.
  **/
 void
 gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view)