diff --git a/debian/qgis-common.install b/debian/qgis-common.install
index c635f6671c4..9860bceb1d1 100644
--- a/debian/qgis-common.install
+++ b/debian/qgis-common.install
@@ -9,8 +9,8 @@ usr/share/qgis/doc/developersmap.html
 usr/share/qgis/doc/favicon.ico
 usr/share/qgis/doc/images
 usr/share/qgis/doc/index.html
-usr/share/qgis/doc/news
-usr/share/qgis/doc/news.html
+usr/share/qgis/doc/NEWS
+usr/share/qgis/doc/NEWS.html
 usr/share/qgis/doc/nohelp.html
 usr/share/qgis/doc/style.css
 usr/share/qgis/i18n/*
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 75d4505895a..6e93d6a65ba 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,3 @@
-INCLUDE(CopyResources)
-
 # include doxygen documentation
 SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
 
@@ -13,43 +11,37 @@ INCLUDE(Txt2Tags)
 FIND_TXT2TAGS()
 
 IF(TXT2TAGS_EXECUTABLE)
-  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t news.t2t)
+  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
   IF(WITH_TXT2TAGS_PDF)
-    ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t news.t2t)
+    ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
   ENDIF(WITH_TXT2TAGS_PDF)
   FILE(GLOB t2tfiles doc/*.t2t)
   ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES} ${t2tfiles})
 ELSE(TXT2TAGS_EXECUTABLE)
   SET(QGIS_DOC_FILES
-    ${CMAKE_SOURCE_DIR}/INSTALL
+    ../INSTALL
+    ../NEWS
+    INSTALL.html
+    NEWS.html
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-FOREACH(DOC_FILE ${QGIS_DOC_FILES})
-  FILE(RELATIVE_PATH REL_DOC_FILE ${CMAKE_CURRENT_SOURCE_DIR} ${DOC_FILE})
-  SET(QGIS_REL_DOC_FILES ${QGIS_REL_DOC_FILES} ${REL_DOC_FILE})
-ENDFOREACH()
-
-SET(QGIS_REL_DOC_FILES
-  ${QGIS_REL_DOC_FILES}
-  index.html 
-  news.html 
-  developersmap.html 
-  nohelp.html 
-  favicon.ico 
-  style.css 
-  AUTHORS 
-  CONTRIBUTORS 
-  SPONSORS 
-  DONORS 
-  TRANSLATORS 
+SET(QGIS_DOC_FILES
+  ${QGIS_DOC_FILES}
+  index.html
+  developersmap.html
+  nohelp.html
+  favicon.ico
+  style.css
+  AUTHORS
+  CONTRIBUTORS
+  SPONSORS
+  DONORS
+  TRANSLATORS
   LICENSE
 )
 
-ADD_QGIS_RESOURCES("${CMAKE_CURRENT_SOURCE_DIR}" doc DEST_DOC_FILES "${QGIS_REL_DOC_FILES}")
-
-ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DEST_DOC_FILES})
-
+INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
 
 # Sponsor images
diff --git a/doc/news.html b/doc/NEWS.html
similarity index 100%
rename from doc/news.html
rename to doc/NEWS.html
diff --git a/doc/news.t2t b/doc/NEWS.t2t
similarity index 99%
rename from doc/news.t2t
rename to doc/NEWS.t2t
index 5b4e4d5cde9..daaac465b93 100644
--- a/doc/news.t2t
+++ b/doc/NEWS.t2t
@@ -24,13 +24,13 @@ Change history for the QGIS Project
 %rather apply it selectively to paragraphs where needed.
 
 % To generate the text version of this document:
-% txt2tags -t txt -o ../NEWS news.t2t
+% txt2tags -t txt -o ../NEWS NEWS.t2t
 % To generate the mediawiki version of this document:
-% txt2tags -t wiki --no-enum-title -o NEWS.wiki news.t2t
+% txt2tags -t wiki --no-enum-title -o NEWS.wiki NEWS.t2t
 % To generate the html version of this document:
-% txt2tags -t html -o news.html news.t2t
+% txt2tags -t html -o NEWS.html NEWS.t2t
 % To generate the LaTeX version of this document:
-% txt2tags -t tex -o NEWS.tex NEWS.t2t; pdflatex news.tex
+% txt2tags -t tex -o NEWS.tex NEWS.t2t; pdflatex NEWS.tex
 
 % End of comments
 % -------------------
diff --git a/scripts/update-news.pl b/scripts/update-news.pl
index 5f8be20b431..26aa208b8e9 100755
--- a/scripts/update-news.pl
+++ b/scripts/update-news.pl
@@ -22,7 +22,7 @@ my ($version,$releasename) = @ARGV;
 
 my ($news,$tempfile) = tempfile();
 
-open my $in, "doc/news.t2t";
+open my $in, "doc/NEWS.t2t";
 while(<$in>) {
 	print $news $_;
 	last if /^Last Change/;
@@ -59,10 +59,10 @@ while(<$in>) {
 close $news;
 close $in;
 
-copy($tempfile, "doc/news.t2t");
+copy($tempfile, "doc/NEWS.t2t");
 
-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t";
-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t";
+system "txt2tags --encoding=utf-8 -odoc/NEWS.html -t html doc/NEWS.t2t";
+system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/NEWS.t2t";
 
 =head1 NAME
 
diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
index 9b07d2800f6..9f4217682ec 100644
--- a/src/app/qgsabout.cpp
+++ b/src/app/qgsabout.cpp
@@ -230,7 +230,7 @@ void QgsAbout::setWhatsNew()
 {
   txtWhatsNew->clear();
   txtWhatsNew->document()->setDefaultStyleSheet( QgsApplication::reportStyleSheet() );
-  txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/news.html" );
+  txtWhatsNew->setSource( "file:///" + QgsApplication::pkgDataPath() + "/doc/NEWS.html" );
 }
 
 void QgsAbout::setPluginInfo()