diff --git a/antlr.spec b/antlr.spec
index ececf68..76aebc8 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -28,18 +28,16 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
+%global gcj_support 0
+%global build_jedit  %{?_with_jedit:1}%{!?_with_jedit:0}
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define build_jedit  %{?_with_jedit:1}%{!?_with_jedit:0}
-
-%define section free
-%define native  %{?_with_native:1}%{!?_with_native:0}
+%global section free
+%global native  %{?_with_native:1}%{!?_with_native:0}
 
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -311,6 +309,10 @@ fi
 
 
 %changelog
+* Wed Apr 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.7.7-7
+- Disable gcj.
+- Use %%global.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild