diff --git a/doc/VERSIONS.txt b/CHANGELOG.txt
similarity index 100%
rename from doc/VERSIONS.txt
rename to CHANGELOG.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96311debb82d7201aa01d5566702afd9ec5426f..cc64080b3b5cff6f06f4fb73422d4443258ae877 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1544,8 +1544,9 @@ if(UNIX)
 endif(UNIX)
 
 set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
-set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
+set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt)
+set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CREDITS.txt)
+set(CHANGELOG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.txt)
 set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
 file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
 file(GLOB DEMOS ${CMAKE_CURRENT_SOURCE_DIR}/demos/*)
@@ -1595,6 +1596,7 @@ if(WIN32 OR CYGWIN)
     unix2dos(WELCOME_FILE)
     unix2dos(LICENSE_FILE)
     unix2dos(CREDITS_FILE)
+    unix2dos(CHANGELOG_FILE)
     unix2dos(TUTORIAL_FILES)
     foreach(DIR ${DEMOS_DIRS})
       file(GLOB DEMO_FILES ${DIR}/?*.*)
@@ -1668,6 +1670,7 @@ endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
 install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
 install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC})
 install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC})
+install(FILES ${CHANGELOG_FILE} DESTINATION ${GMSH_DOC})
 install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial)
 foreach(DIR ${DEMOS_DIRS})
   get_filename_component(DEMOS_DIR_NAME ${DIR} NAME)
@@ -1723,7 +1726,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${OPT_TEXI}"
 if(MAKEINFO AND TEXI2PDF)
   add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
                     ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
-                    doc/CREDITS.txt doc/LICENSE.txt doc/VERSIONS.txt
+                    CREDITS.txt LICENSE.txt CHANGELOG.txt
                     doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info
                     doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
                     COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
diff --git a/doc/CREDITS.txt b/CREDITS.txt
similarity index 100%
rename from doc/CREDITS.txt
rename to CREDITS.txt
diff --git a/doc/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from doc/LICENSE.txt
rename to LICENSE.txt
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 195017ec6c96444984836f6d7411e103262187e3..fb7b6b5b12460f0bbdfd1b3ebe820ed25bcbee44 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -170,7 +170,7 @@ algorithms</a>.
     <a href="http://gitlab.onelab.info/gmsh/gmsh/commits/master">time line</a>
     of changes and the <a href="http://gitlab.onelab.info/gmsh/gmsh/issues">bug
     tracking</a> database
-  <li><a href="doc/VERSIONS.txt">Version history</a>
+  <li><a href="CHANGELOG.txt">Version history</a>
   <li>Mailing lists:
     <ul>
       <li><a href="http://onelab.info/mailman/listinfo/gmsh/">gmsh</a>
@@ -208,9 +208,9 @@ program, you can file a report directly
 Gmsh is copyright (C) 1997-2017 by
 <a href="http://www.montefiore.ulg.ac.be/~geuzaine">C. Geuzaine</a> and
 <a href="http://perso.uclouvain.be/jean-francois.remacle/">J.-F. Remacle</a>
-(see the <a href="doc/CREDITS.txt">CREDITS</a> file for more information) and
+(see the <a href="CREDITS.txt">CREDITS</a> file for more information) and
 is distributed under the terms of
-the <a href="doc/LICENSE.txt">GNU General Public License
+the <a href="LICENSE.txt">GNU General Public License
 (GPL)</a> (version 2 or later, with an exception to allow for easier
 linking with external libraries).
 </p>
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index e043562b86a29513c1e98837699c4cfc15828be3..9ace4c9450d66116e1bfcb2773db061c71232e5a 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -5660,7 +5660,7 @@ If your dataset is constant per element make sure you don't use the
 @cindex History, versions
 @cindex Changelog
 
-@verbatiminclude ../VERSIONS.txt
+@verbatiminclude ../../CHANGELOG.txt
 
 @c =========================================================================
 @c Copyright and credits
@@ -5674,7 +5674,7 @@ If your dataset is constant per element make sure you don't use the
 @cindex Contributors, list
 @cindex Credits 
 
-@verbatiminclude ../CREDITS.txt
+@verbatiminclude ../../CREDITS.txt
 
 @c =========================================================================
 @c License
@@ -5685,7 +5685,7 @@ If your dataset is constant per element make sure you don't use the
 
 @cindex License
 
-@verbatiminclude ../LICENSE.txt
+@verbatiminclude ../../LICENSE.txt
 
 @c =========================================================================
 @c Concept Index (cindex)