diff --git a/CHANGELOG.md b/CHANGELOG.md
index 660c03d0..c659be29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,8 @@
 * [#680](https://github.com/foosel/OctoPrint/issues/680) - Don't accidentally include a newline from the MIME headers
   in the parsed multipart data from file uploads
 * [#709](https://github.com/foosel/OctoPrint/issues/709) - Properly initialize time estimation for SD card transfers too
+* [#717](https://github.com/foosel/OctoPrint/issues/717) - Use ``shutil.move`` instead of ``os.rename`` to avoid cross
+  device renaming issues
 * Various fixes of bugs in newly introduced features and improvements:
   * [#625](https://github.com/foosel/OctoPrint/pull/625) - Newly added GCODE files were not being added to the analysis
     queue
diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py
index 239cd8c9..fa168efc 100644
--- a/src/octoprint/util/__init__.py
+++ b/src/octoprint/util/__init__.py
@@ -183,7 +183,6 @@ def safeRename(old, new, throw_error=False):
 				raise e
 	else:
 		# on anything else than windows it's ooooh so much easier...
-		# because of shutil's high level, maybe win32-specific code isn't needed anymore
 		shutil.move(old, new)