diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe000682abea1840187c5389b0ea62bdd11dc06..b96311debb82d7201aa01d5566702afd9ec5426f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1774,11 +1774,9 @@ set(CPACK_PACKAGE_EXECUTABLE "gmsh;Gmsh")
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-source)
 set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}" "/CVS/" "/.svn" "~$"
-    "DS_Store$" "GmshConfig.h$" "GmshVersion.h$" "/benchmarks/" "/tmp/"
+set(CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}" "/CVS/" "/.svn" "/.git"
+    "~$" "DS_Store$" "GmshConfig.h$" "GmshVersion.h$" "/benchmarks/" "/tmp/"
     "/bin/" "/lib/" "/nightly/" "GPATH" "GRTAGS" "GSYMS" "GTAGS" "/HTML/"
-    "/projects/"
-    "/FunctionSpace/" "/Mesh/meshRecombine*" "/utils/solvers/legacy/"
     "/contrib/3M/" "/contrib/Parasolid/")
 
 if(UNIX)
diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index f982e3549b54c16893e299cbc682d00e32a01c63..22bc39a56459eacc04ba0f67c5a3feb6994a8735 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -12,7 +12,7 @@ set(CUSTOM_DROP_SITE "onelab.info")
 set(CUSTOM_DROP_LOCATION "/CDash/submit.php?project=Gmsh")
 set(CUSTOM_DROP_PROJECT "Gmsh")
 
-find_program(CTEST_SVN_COMMAND NAMES svn)
+find_program(CTEST_GIT_COMMAND NAMES git)
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 
@@ -23,13 +23,13 @@ else(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 
 set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/src/gmsh")
-set(CTEST_SVN_REPOS https://onelab.info/svn/gmsh/trunk)
+set(CTEST_GIT_REPOS http://gitlab.onelab.info/gmsh/gmsh.git)
 
 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
   set(CTEST_CHECKOUT_COMMAND 
-      "${CTEST_SVN_COMMAND} co ${CTEST_SVN_REPOS} ${CTEST_SOURCE_DIRECTORY}")
+      "${CTEST_GIT_COMMAND} pull ${CTEST_GIT_REPOS} ${CTEST_SOURCE_DIRECTORY}")
 endif(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
-set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}")
+set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")
 
 set(CTEST_CONFIGURE_COMMAND 
     "${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
@@ -61,7 +61,7 @@ endif(NOT CDASH_MODEL)
 
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 ctest_start(${CDASH_MODEL})
-# update from SVN only for nightly builds
+# update from GIT only for nightly builds
 if(CDASH_MODEL MATCHES "Nightly")
   ctest_update()
 endif(CDASH_MODEL MATCHES "Nightly")
@@ -101,14 +101,14 @@ macro(upload_package WEB ARCH EXTRA EXT1 EXT2)
         message("Done re-signing MacOS build on ace36")
       endif(APPLE)
       message("Build succeeded: uploading package ${BASENAME} to web site")
-      if(${FILE} MATCHES "-svn")
-        execute_process(COMMAND scp -C ${FILE} ${WEB}/gmsh-svn-${ARCH}${EXTRA}${EXT2}
+      if(${FILE} MATCHES "-git")
+        execute_process(COMMAND scp -C ${FILE} ${WEB}/gmsh-git-${ARCH}${EXTRA}${EXT2}
                         TIMEOUT 60)
-      else(${FILE} MATCHES "-svn")
+      else(${FILE} MATCHES "-git")
         string(REPLACE ${EXT1} "" BASE ${BASENAME})
         execute_process(COMMAND scp -C ${FILE} ${WEB}/${BASE}${EXTRA}${EXT2}
                         TIMEOUT 60)
-      endif(${FILE} MATCHES "-svn")
+      endif(${FILE} MATCHES "-git")
       message("Done uploading package to web site")
     endif(FILE)
   endif($ENV{GMSH_BUILD_ERRORS} GREATER 0)
diff --git a/utils/nightly/gmsh_linux32_nightly.ctest b/utils/nightly/gmsh_linux32_nightly.ctest
index 9dd36a0f620bf618fc254480a08212c4d96e501b..f5e62bfcc6a1175e8c740147e099703737d05751 100644
--- a/utils/nightly/gmsh_linux32_nightly.ctest
+++ b/utils/nightly/gmsh_linux32_nightly.ctest
@@ -5,5 +5,5 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_linux32_test.ctest b/utils/nightly/gmsh_linux32_test.ctest
index c8f67c4e3730295f492d13a76bf8991579c1f6ae..bf6963f1f01c7441ba51325686d4d193636e26dc 100644
--- a/utils/nightly/gmsh_linux32_test.ctest
+++ b/utils/nightly/gmsh_linux32_test.ctest
@@ -3,5 +3,5 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@onelab.info>.
 
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_linux64_nightly.ctest b/utils/nightly/gmsh_linux64_nightly.ctest
index ec9d098f1f502945647c7f263c6ce93dcd0079f0..3fdad82e5c5c826e88af2f94a28be372b118b0af 100644
--- a/utils/nightly/gmsh_linux64_nightly.ctest
+++ b/utils/nightly/gmsh_linux64_nightly.ctest
@@ -5,12 +5,12 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_linux64.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_linux64.ctest)
 
-set(EXTRA_VERSION "-coverage-svn")
+set(EXTRA_VERSION "-coverage-git")
 include(gmsh_linux64_coverage.ctest)
diff --git a/utils/nightly/gmsh_linux64_test.ctest b/utils/nightly/gmsh_linux64_test.ctest
index a970f37625e23c86e9c8ef564100ad6441bdbdc0..88a26467c01f90c9ae7a0e3f21111c434488ddc5 100644
--- a/utils/nightly/gmsh_linux64_test.ctest
+++ b/utils/nightly/gmsh_linux64_test.ctest
@@ -3,9 +3,9 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@onelab.info>.
 
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_linux64.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_linux64.ctest)
diff --git a/utils/nightly/gmsh_mac_nightly.ctest b/utils/nightly/gmsh_mac_nightly.ctest
index 7880778e080a886a3f69356b5d8639b7a767aa40..4149bff3e85db4840efcd5efa603ccc60b2954c4 100644
--- a/utils/nightly/gmsh_mac_nightly.ctest
+++ b/utils/nightly/gmsh_mac_nightly.ctest
@@ -5,9 +5,9 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_mac.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_mac_test.ctest b/utils/nightly/gmsh_mac_test.ctest
index a017e77182fd83578f6b0048b94720203591898f..eb8eb0bcc32a5413276c4cb46816bfb16eb327fd 100644
--- a/utils/nightly/gmsh_mac_test.ctest
+++ b/utils/nightly/gmsh_mac_test.ctest
@@ -3,9 +3,9 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@onelab.info>.
 
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_mac.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_msvc_nightly.ctest b/utils/nightly/gmsh_msvc_nightly.ctest
index a9bfcddf2a6fbf8db22a1065fd9ea1a75bbd5c87..ae7d07d75e281548a20e60953b7289e7f85ce549 100644
--- a/utils/nightly/gmsh_msvc_nightly.ctest
+++ b/utils/nightly/gmsh_msvc_nightly.ctest
@@ -5,5 +5,5 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-msvc-svn")
+set(EXTRA_VERSION "-msvc-git")
 include(gmsh_msvc.ctest)
diff --git a/utils/nightly/gmsh_win32_nightly.ctest b/utils/nightly/gmsh_win32_nightly.ctest
index 88a02d7c3eaa05735a628aff13c89f727abc6c72..e070d16aa5604b5a204d3c81ce5414d3095d3264 100644
--- a/utils/nightly/gmsh_win32_nightly.ctest
+++ b/utils/nightly/gmsh_win32_nightly.ctest
@@ -5,5 +5,5 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win32_test.ctest b/utils/nightly/gmsh_win32_test.ctest
index b2b804673a790ca09d37c848489909848caafd0e..d10e7e4740d9843c6df8983a93ab009ed627072a 100644
--- a/utils/nightly/gmsh_win32_test.ctest
+++ b/utils/nightly/gmsh_win32_test.ctest
@@ -3,5 +3,5 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@onelab.info>.
 
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win64_nightly.ctest b/utils/nightly/gmsh_win64_nightly.ctest
index 99e493a5c324407c3352f92338b5ad81d3528933..18620b1a9859bfe4c4441b343efa20514585d8c0 100644
--- a/utils/nightly/gmsh_win64_nightly.ctest
+++ b/utils/nightly/gmsh_win64_nightly.ctest
@@ -5,9 +5,9 @@
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_win64.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_win64.ctest)
diff --git a/utils/nightly/gmsh_win64_test.ctest b/utils/nightly/gmsh_win64_test.ctest
index 035be86e47c7c79325b38469523b2ba43fd99139..bd852fdc4e97fa23ec59db9cac116e53da7bdd12 100644
--- a/utils/nightly/gmsh_win64_test.ctest
+++ b/utils/nightly/gmsh_win64_test.ctest
@@ -3,9 +3,9 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@onelab.info>.
 
-set(EXTRA_VERSION "-svn")
+set(EXTRA_VERSION "-git")
 include(gmsh_win64.ctest)
 
-set(EXTRA_VERSION "-dynamic-svn")
+set(EXTRA_VERSION "-dynamic-git")
 set(BUILD_DYNAMIC true)
 include(gmsh_win64.ctest)