diff --git a/scripts/indent-c++.el b/scripts/indent-c++.el
index 17ab26ba5..ffbfaf68d 100644
--- a/scripts/indent-c++.el
+++ b/scripts/indent-c++.el
@@ -1,5 +1,6 @@
 (c++-mode)
 (setq indent-tabs-mode nil)
 (indent-region (point-min) (point-max))
-(set-buffer-file-coding-system 'unix)
+(set-buffer-file-coding-system 'utf-8-unix)
+(delete-trailing-whitespace)
 (save-buffer)