diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 0fb8cfa34..3ff376255 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -64,4 +64,6 @@ webgui.
  - Added the Web Services Client wobject. (Thanks to Alan Ritari and DonorWare.)
  - Optional second parameter to the File macro can be a boolean value to
    turn off file icons.
+ - Added drag and drop content arranging.
+
 
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
index 9a43f1fee..721f09264 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
@@ -606,10 +606,7 @@ sub _positionFormat6x {
 			<tmpl_if wobject.canView> 
 				<div class="wobject"> <div class="wobject<tmpl_var wobject.namespace>" id="wobjectId<tmpl_var wobject.id>">
 				<tmpl_if session.var.adminOn> <tmpl_if wobject.canEdit>
-					<tmpl_var wobject.controls>
-					<tmpl_if page.canEdit>
-						<tmpl_var wobject.controls.drag>
-					</tmpl_if>
+					<tmpl_var wobject.controls><tmpl_if page.canEdit><tmpl_var wobject.controls.drag></tmpl_if>
 				</tmpl_if> </tmpl_if>
 				<tmpl_if wobject.isInDateRange>
                       			<a name="<tmpl_var wobject.id>"></a>