diff --git a/CHANGES.txt b/CHANGES.txt
index 2baf7d58e..eaf796fb6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,32 +13,31 @@ http://sourceforge.net/apps/trac/speed-dreams/wiki/TheWayToRelease2
 
 Changes since 2.0.0 Alpha 1 released in 2.0.0 Alpha 2
 -----------------------------------------------------
-This release was build from SVN https://speed-dreams.svn.sourceforge.net/svnroot/speed-dreams/tags/2.0.0-a2@????3102?????.
+This release was build from SVN https://speed-dreams.svn.sourceforge.net/svnroot/speed-dreams/tags/2.0.0-a2@3111.
 
 Tracks:
 * HQ texture rework + renaming + localization for Wheel-2 (=> Karwada), GTrack2 (=> Chemisay)
 * new Brondehach track :  HQ texture rework + localization + no more real-life brands 
     + better drivable track sides
 * Improved Goldstone Sand (reworked textures + made pit wall compatible with robots)
-* Texture improvements : Forza, Corkscrew, Aalborg, Migrants
+* Texture improvements : Forza, Corkscrew, Aalborg
 
 Cars:
 * T01 : Final fine tuned LS1 setups with updated engine sounds
-* Reworked Spirit RB1 LT (3D model, speedo/tachometer, texture)
+* Reworked Spirit RB1 LT (3D model, speedo/tachometer)
 * Many new livery skins for LS1 cars
 * New TRB1 Vieringe 5 RB and liveries (human + USR setups ??)
 * #191 Added e-brake power parameters for SuperCars (and RSs)
 * #222 Skinnable pit door logo, 3D wheels and interior (when choosing a car livery skin)
 * Renamed GP1600 category to MP5
 * Moved WR cars to the RS category (Rally Series) and optimized artwork file sizes.
-* Improved reflections for all cars
 
 Robots:
 * D38 : New Kilo2008 robot with skilling, setup for the TRB1 Cavallo 360 RB and LS1 Archer R9
 * D19 : Rain support added to Simplix (work in progress)
 * Added detailed race lines to Simplix
-* Up-to-date LS1 Simplix setups for many circuit + road + speedway tracks (work in progress)
-* Up-to-date TRB1 Simplix setups for many circuit + road + speedway tracks (work in progress)
+* Updated LS1 Simplix setups for many circuit + road + speedway tracks (work in progress)
+* Updated TRB1 Simplix setups for many circuit + road + speedway tracks (work in progress)
 * #179 Speed limiter command now toggles on/off for human drivers
        (no more need to keep the key pressed)
 * #178 Forbid reverse gear if not Neutral state or speed < 10ms = 36km/h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739470eb2..9675aa09e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ CHECK_PACKAGES()
 
 #Calculate version
 #Set version which doesn't follow from HeadURL
-SET(HEAD_URL "$HeadURL: https://speed-dreams.svn.sourceforge.net/svnroot/speed-dreams/trunk/CMakeLists.txt $")
+SET(HEAD_URL "$HeadURL$")
 SET(NEXT_LESSER_VERSION 0) # The next lesser version
 SET(NEXT_MAJOR_MINOR_VERSION "2.0") # Next major.minor version
 
diff --git a/cmake/macros.cmake b/cmake/macros.cmake
index a376823d0..5effa25d6 100644
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -976,12 +976,13 @@ MACRO(SD_INSTALL_CAR CARNAME)
 
 	SET(SDIC_FILES ${CARNAME}.xml ${ARGN})
 
-	FILE(GLOB FILES_ACC *.acc)
-	FILE(GLOB FILES_PNG *.png)
-	FILE(GLOB FILES_JPG *.jpg)
-	FILE(GLOB FILES_RGB *.rgb)
-	FILE(GLOB FILES_WAV *.wav)
-	SET(SDIC_FILES ${SDIC_FILES} ${FILES_ACC} ${FILES_RGB} ${FILES_PNG} ${FILES_JPG} ${FILES_WAV})
+	FILE(GLOB AC3D_FILES *.acc)
+	FILE(GLOB PNG_FILES *.png)
+	FILE(GLOB JPG_FILES *.jpg)
+	FILE(GLOB RGB_FILES *.rgb)
+	FILE(GLOB WAV_FILES *.wav)
+
+	SET(SDIC_FILES ${SDIC_FILES} ${AC3D_FILES} ${RGB_FILES} ${PNG_FILES} ${JPG_FILES} ${WAV_FILES})
 
 	SD_INSTALL_FILES(DATA cars/${CARNAME} FILES ${SDIC_FILES})
 
@@ -991,12 +992,25 @@ MACRO(SD_INSTALL_TRACK TRACKNAME CATEGORY)
 
 	SET(SDIT_FILES ${TRACKNAME}.xml ${ARGN})
 
-	FILE(GLOB FILES_ACC *.acc)
-	FILE(GLOB FILES_AC  *.ac)
-	FILE(GLOB FILES_PNG *.png)
-	FILE(GLOB FILES_JPG *.jpg)
-	FILE(GLOB FILES_RGB *.rgb)
-	SET(SDIT_FILES ${SDIT_FILES} ${FILES_AC} ${FILES_ACC} ${FILES_RGB} ${FILES_PNG} ${FILES_JPG})
+	# Among AC3D files, keep any .acc one, but exclude *-src.ac
+	# and *.ac when a .acc with same name exists.
+	FILE(GLOB ACC_FILES *.acc)
+	FILE(GLOB SRCAC_FILES *-src.ac)
+	FILE(GLOB AC_FILES *.ac)
+	FOREACH(AC_FILE ${AC_FILES})
+		LIST(FIND SRCAC_FILES "${AC_FILE}" IS_SRC)
+		LIST(FIND ACC_FILES "${AC_FILE}c" HAS_ACC)
+		IF(IS_SRC EQUAL -1 AND HAS_ACC EQUAL -1)
+			LIST(APPEND AC3D_FILES ${AC_FILE})
+		ENDIF()
+	ENDFOREACH()
+	SET(AC3D_FILES ${AC3D_FILES} ${ACC_FILES})
+
+	FILE(GLOB PNG_FILES *.png)
+	FILE(GLOB JPG_FILES *.jpg)
+	FILE(GLOB RGB_FILES *.rgb)
+
+	SET(SDIT_FILES ${SDIT_FILES} ${AC3D_FILES} ${RGB_FILES} ${PNG_FILES} ${JPG_FILES})
 
 	SD_INSTALL_FILES(DATA tracks/${CATEGORY}/${TRACKNAME} FILES ${SDIT_FILES})