Index: main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
===================================================================
--- main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml	(revision 23254)
+++ main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml	(revision 23493)
@@ -158,5 +158,5 @@
 			
 			<mkdir dir="products"/>
-			<copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/>
+			<copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}${version-extra}.exe"/>
 			<move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/>
 
Index: main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml
===================================================================
--- main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml	(revision 23254)
+++ main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml	(revision 23493)
@@ -136,5 +136,5 @@
 			</exec>
 			<exec executable="link" dir="cdrom/build">
-				<arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
+				<arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
 			</exec>
 
@@ -150,5 +150,5 @@
 			<echo level="info">link the compiled code</echo>
 			<exec executable="g++" dir="cdrom/build">
-				<arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux wrapper.o"/>
+				<arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/>
 			</exec>
 
@@ -158,14 +158,14 @@
 			<mkdir dir="wrapped-installer/cdrom"/>
 			<!-- create app for cdrom installer -->
-			<copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
-			<copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
-			<chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
+			<chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
 
 			<!-- copy bundled files -->
-			<copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
 
 			<!-- substitute in real values -->
-			<rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
-			<rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+			<rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
+			<rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
 			
 		</if></else></if></else></if>
@@ -176,5 +176,5 @@
 		<!-- (windows) -->
 		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-			<tar destfile="products/cdrom-components-${version}-windows.tar.gz" compression="gzip">
+			<tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip">
 				<tarfileset dir="cdrom/dist">
 					<include name="**/*"/>
@@ -183,5 +183,5 @@
 				</tarfileset>
 			</tar>
-			<tar destfile="products/cdrom-components-${version}-full-windows.tar.gz" compression="gzip">
+			<tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip">
 				<tarfileset dir="cdrom/dist">
 					<include name="**/*"/>
@@ -195,5 +195,5 @@
 			<exec dir="cdrom/dist" executable="bash">
 				<arg value="-c"/>
-				<arg value="tar -czf ../../products/cdrom-components-${version}-${rk.os}.tar.gz *"/>
+				<arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}.tar.gz *"/>
 			</exec>
 		</if></else></if>
