diff --git a/resources/install/ant-build-config.properties b/resources/install/ant-build-config.properties
index 5e2b750e3..0e06429f5 100644
--- a/resources/install/ant-build-config.properties
+++ b/resources/install/ant-build-config.properties
@@ -8,3 +8,11 @@ installer.welcome.wtext3=
 wix.product.id=ACD610AA-E7F1-4644-894D-D8A31894A241
 wix.upgrade.code=B3854E66-BAE5-409F-B5EB-7649CB48F99A
 #application.home.dirname=.sip-communicator
+link.download.windows=http\://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}.exe
+link.download.windows32=http\://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}-x86.exe
+link.download.windows64=http\://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}-x64.exe
+link.download.debian=http\://download.sip-communicator.org/nightly/debian/${package.name}_${sip-communicator.version}_i386.deb
+link.download.generic=http\://download.sip-communicator.org/nightly/generic/${package.name}-${sip-communicator.version}.jar
+link.download.linux=http\://download.sip-communicator.org/nightly/linux/${package.name}-${sip-communicator.version}-linux.bin
+link.updates.macosx=http\://download.sip-communicator.org/nightly/macosx/sparkle/updates.xml
+
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 5a5ea8fc5..5d8d60bf2 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -32,11 +32,16 @@
 
     <import file="../../build.xml"/>
 
-    <property file="${inst.resrc}/ant-build-config.properties"/>
     <!-- Load installer properties -->
     <!-- USERS NEED TO UPDATE THIS FILE -->
     <property file="${inst.resrc}/installers.properties"/>
 
+    <target name="load-properties" depends="version">
+    <!-- load properties on demand here so it can evaluate
+        and sip-communicator.version property from property file-->
+        <property file="${inst.resrc}/ant-build-config.properties"/>
+    </target>
+
     <!-- define the izpack task in a separate target so that we don't get an
          error when izpack properties are not set-->
     <target name="define-izpack-task">
@@ -159,13 +164,13 @@
     </target>
 
     <target name="build-installation-generic"
-            depends="clean-install-generic,define-izpack-task,version">
+            depends="clean-install-generic,define-izpack-task,load-properties">
 
         <propertyfile file="${generic.app.dir}/versionupdate.properties"
             comment="Last Build Version">
             <entry  key="last_version" value="${sip-communicator.version}"/>
             <entry  key="download_link"
-                    value="http://download.sip-communicator.org/nightly/generic/${package.name}-${sip-communicator.version}.jar"/>
+                    value="${link.download.generic}"/>
         </propertyfile>
 
         <filter token="VERSION" value="${sip-communicator.version}" />
@@ -216,13 +221,13 @@
     </target>
 
     <target name="build-installation-linux"
-            depends="clean-install-linux,define-izpack-task,version">
+            depends="clean-install-linux,define-izpack-task,load-properties">
 
         <propertyfile file="${linux.app.dir}/versionupdate.properties"
             comment="Last Build Version">
             <entry  key="last_version" value="${sip-communicator.version}"/>
             <entry  key="download_link"
-                    value="http://download.sip-communicator.org/nightly/linux/${package.name}-${sip-communicator.version}-linux.bin"/>
+                    value="${link.download.linux}"/>
         </propertyfile>
 
         <filter token="VERSION" value="${sip-communicator.version}" />
@@ -311,13 +316,13 @@
     </target>
 
     <target name="build-installation-windows"
-            depends="clean-install-windows,define-izpack-task,version">
+            depends="clean-install-windows,define-izpack-task,load-properties">
 
         <propertyfile file="${windows.app.dir}/versionupdate.properties"
             comment="Last Build Version">
             <entry  key="last_version" value="${sip-communicator.version}"/>
             <entry  key="download_link"
-                    value="http://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}.exe"/>
+                    value="${link.download.windows}"/>
         </propertyfile>
 
         <filter token="VERSION" value="${sip-communicator.version}" />
@@ -404,19 +409,19 @@
     </target>
 
     <target name="build-installation-wix"
-            depends="version">
+            depends="load-properties">
         <property name="windows_native_path" value="${sc.basedir}\lib\native\windows"/>
         <property name="windows.jre.arch.file" value="${windows.jre.file}"/>
-        <property name="windows.download.link" value="http://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}-x86.exe"/>
+        <property name="windows.download.link" value="${link.download.windows32}"/>
         <property name="windows.package.name" value="${package.name}-${sip-communicator.version}-x86.exe"/>
         <antcall target="build-installation-wix-base" />
     </target>
 
     <target name="build-installation-wix-64"
-            depends="version">
+            depends="load-properties">
         <property name="windows_native_path" value="${sc.basedir}\lib\native\windows-64"/>
         <property name="windows.jre.arch.file" value="${windows.jre64.file}"/>
-        <property name="windows.download.link" value="http://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}-x64.exe"/>
+        <property name="windows.download.link" value="${link.download.windows64}"/>
         <property name="windows.package.name" value="${package.name}-${sip-communicator.version}-x64.exe"/>
         <antcall target="build-installation-wix-base" />
     </target>
@@ -492,11 +497,11 @@
         </copy>
 
         <!--
-            This versionupdate.properties file is the only of interest to the
+            This update-location.properties file is the only of interest to the
             MSI i.e. it gets installed on the user machine.
         -->
         <copy
-                file="${inst.resrc}/windows/versionupdate.properties"
+                file="windows/update-location.properties"
                 todir="${light.dir}"
                 overwrite="true" />
 
@@ -665,7 +670,7 @@
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Versions/Current"/>
     </target>
 
-    <target name="macosx" depends="version"
+    <target name="macosx" depends="load-properties"
             description="Create an .app package for MACOSX">
 
       <taskdef name="jarbundler"
@@ -861,7 +866,7 @@
     <key>SUPublicDSAKeyFile</key>
     <string>sparkle_dsa_pub.pem</string>
     <key>SUFeedURL</key>
-    <string>http://download.sip-communicator.org/nightly/macosx/sparkle/updates.xml</string>
+    <string>${link.updates.macosx}</string>
     <key>SUShowReleaseNotes</key>
     <string>YES</string>
     <key>CFBundleName</key>]]></replacevalue>
@@ -964,7 +969,7 @@
     </target>
 
     <!-- Create a Debian package - This needs dpkg utilities -->
-    <target name="deb" depends="version,dpkg-build-warning,-prepare-debian-sh"
+    <target name="deb" depends="load-properties,dpkg-build-warning,-prepare-debian-sh"
             if="dpkg.build.present"
             description="Create a .deb package for Debian (needs dpkg utilities)">
 
@@ -1065,7 +1070,7 @@
             comment="Last Build Version">
             <entry  key="last_version" value="${sip-communicator.version}"/>
             <entry  key="download_link"
-                    value="http://download.sip-communicator.org/nightly/debian/${package.name}_${sip-communicator.version}_i386.deb"/>
+                    value="${link.download.debian}"/>
     </propertyfile>
 
     <!--
diff --git a/resources/install/debian/rules.tmpl b/resources/install/debian/rules.tmpl
index 93022c91e..d78c6320f 100755
--- a/resources/install/debian/rules.tmpl
+++ b/resources/install/debian/rules.tmpl
@@ -55,7 +55,7 @@ install: build
 	cp $(BASEDIR)/resources/install/logging.properties debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/
 	cp debian/felix.client.run.properties debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/
 	cp -r $(BASEDIR)/lib/bundle debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/
-	cp debian/versionupdate.properties debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/
+	cp debian/update-location.properties debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/
 
 	# Copy OS specific and native libs
 	cp $(BASEDIR)/lib/os-specific/linux/*.jar debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/
diff --git a/resources/install/debian/versionupdate.properties b/resources/install/debian/update-location.properties
similarity index 100%
rename from resources/install/debian/versionupdate.properties
rename to resources/install/debian/update-location.properties
diff --git a/resources/install/generic/installer-generic.xml b/resources/install/generic/installer-generic.xml
index 5d173dcf7..46f7d5f4f 100755
--- a/resources/install/generic/installer-generic.xml
+++ b/resources/install/generic/installer-generic.xml
@@ -94,7 +94,7 @@
 		<!-- The executable files -->
 		<pack name="run" required="yes">
                     <description>Exceutable</description>
-                    <file targetdir="$INSTALL_PATH" src="resources/install/generic/versionupdate.properties" override="true"/>
+                    <file targetdir="$INSTALL_PATH" src="resources/install/generic/update-location.properties" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/generic/run.sh" os="linux" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" os="windows" override="true"/>
diff --git a/resources/install/generic/versionupdate.properties b/resources/install/generic/update-location.properties
similarity index 100%
rename from resources/install/generic/versionupdate.properties
rename to resources/install/generic/update-location.properties
diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml
index 9b8dd81b5..17dc40d1a 100755
--- a/resources/install/linux/installer-linux.xml
+++ b/resources/install/linux/installer-linux.xml
@@ -111,7 +111,7 @@
 		<!-- The executable files -->
 		<pack name="run" required="yes">
                     <description>Executable</description>
-                    <file targetdir="$INSTALL_PATH" src="resources/install/linux/versionupdate.properties"  override="true"/>
+                    <file targetdir="$INSTALL_PATH" src="resources/install/linux/update-location.properties"  override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/linux/run.sh" os="linux"  override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/linux/sc-logo.png" os="linux" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/linux/uninstall.sh"  override="true"/>
diff --git a/resources/install/linux/versionupdate.properties b/resources/install/linux/update-location.properties
similarity index 100%
rename from resources/install/linux/versionupdate.properties
rename to resources/install/linux/update-location.properties
diff --git a/resources/install/windows/installer-windows.xml b/resources/install/windows/installer-windows.xml
index b91c309b7..724a41afc 100755
--- a/resources/install/windows/installer-windows.xml
+++ b/resources/install/windows/installer-windows.xml
@@ -126,7 +126,7 @@
         <!-- The executable files -->
         <pack name="run" required="yes">
                     <description>Executable</description>
-                    <file targetdir="$INSTALL_PATH" src="resources/install/windows/versionupdate.properties" override="true"/>
+                    <file targetdir="$INSTALL_PATH" src="resources/install/windows/update-location.properties" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.exe" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/run.bat" override="true"/>
                     <file targetdir="$INSTALL_PATH" src="resources/install/windows/uninstall.exe" override="true"/>
diff --git a/resources/install/windows/versionupdate.properties b/resources/install/windows/update-location.properties
similarity index 100%
rename from resources/install/windows/versionupdate.properties
rename to resources/install/windows/update-location.properties
diff --git a/src/net/java/sip/communicator/plugin/updatechecker/Resources.java b/src/net/java/sip/communicator/plugin/updatechecker/Resources.java
index 1cc3c6d2e..ca92ce2cc 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/Resources.java
+++ b/src/net/java/sip/communicator/plugin/updatechecker/Resources.java
@@ -25,7 +25,7 @@ public class Resources
      * Name of the configuration file name.
      */
     private static final String CONFIG_PROP_FILE_NAME
-        = "versionupdate.properties";
+        = "update-location.properties";
 
     /**
      * The properties contained in CONFIG_PROP_FILE_NAME.