diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml
index 4093feb14..767067e77 100644
--- a/buildScripts/setup.ant.xml
+++ b/buildScripts/setup.ant.xml
@@ -336,6 +336,16 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		<property name="ossrh.username" value="rzwitserloot" />
 	</target>
 	
+	<target name="test.release.version" depends="-test.release.version" />
+	<target name="-test.release.version" depends="version" unless="skip.test.version">
+		<fail>
+			<condition>
+				<not><matches pattern="^.*[02468]$" string="${lombok.version}"/></not>
+			</condition>
+			You need to manually sort out the changelog, and set Version.java so that the release version is an even number (and the name isn't Edgy Guinea Pig). Use -Dskip.test.version= to override.
+		</fail>
+	</target>
+	
 	<fail>ant needs to be at least v1.10.0 or higher to build lombok. Your version is: ${ant.version}
 		<condition>
 			<not><antversion atleast="1.10.0" /></not>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 414fbb926..892548fea 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -263,7 +263,7 @@ such as applying the templates to produce the website, converting the changelog
 		<fail />
 	</target>
 	
-	<target name="release.publish" depends="maven, -release.publish.site, website.publish, eclipsep2.publish, maven.publish" description="Deploys a new official lombok release everywhere: maven, website, p2 site" />
+	<target name="release.publish" depends="-test.release.version, maven, -release.publish.site, website.publish, eclipsep2.publish, maven.publish, -edge.publish" description="Deploys a new official lombok release everywhere: maven, website, p2 site" />
 	
 	<target name="edge.website" depends="compile.support, version, dist">
 		<delete quiet="true" file="build/website/download-edge.html" />
@@ -288,7 +288,9 @@ such as applying the templates to produce the website, converting the changelog
 		
 	<target name="-edge.website.publish" depends="-edge.website.tohost, -website.commit-and-push-hostgit" />
 	
-	<target name="edge.publish" depends="dist, -edge.website.publish, maven.edge" description="Builds an edge release, sends it to the projectlombok.org server and deploys it by updating the download-edge link">
+	<target name="edge.publish" depends="-edge.website.publish, -edge.publish" description="Builds an edge release, sends it to the projectlombok.org server and deploys it by updating the download-edge link" />
+	
+	<target name="-edge.publish" depends="dist, maven.edge">
 		<copy file="dist/lombok-${lombok.version}.jar" tofile="build/edge-releases/lombok-edge.jar" />
 		<java classname="lombok.publish.PublishToBucket" failonerror="true">
 			<classpath>