diff --git a/ant.spec b/ant.spec
index b12d8d0..b060aa7 100644
--- a/ant.spec
+++ b/ant.spec
@@ -32,9 +32,9 @@
 %bcond_without tests
 
 %if %with bootstrap
-%global build_javadoc        0
+%bcond_with javadoc
 %else
-%global build_javadoc        1
+%bcond_without javadoc
 %endif
 
 %global with_manifest_only 0
@@ -389,7 +389,7 @@ mv LICENSE.utf8 LICENSE
 %build
 %if %without bootstrap
 %{ant} jars test-jar
-%if %{build_javadoc}
+%if %with javadoc
 export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
 %{ant} javadocs
 %endif
@@ -489,7 +489,7 @@ echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
 %endif
 
-%if %{build_javadoc}
+%if %with javadoc
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -671,7 +671,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 %doc LICENSE NOTICE
 %doc manual/*
 
-%if %{build_javadoc}
+%if %with javadoc
 %files javadoc
 %doc LICENSE NOTICE
 %{_javadocdir}/%{name}
@@ -688,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 - Update to current packaging guidelines
 - Run tests in %%check instead of %%build
 - Remove dependencies on xerces-j2 and xml-commons-apis
+- Convert %%global build_javadoc to conditional
 
 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
 - Enable unit tests