diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index c244eb3..28c0e1b 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -4,9 +4,7 @@
 %define version		1.2
 %define release		2jpp_3fc
 %define	section		free
-
-# This flag causes the omission of non-free dependencies.
-%define no_nonfree_deps 1
+%define use_nonfree  %{?_with_nonfree:1}%{!?_without_nonfree:0}
 
 Name:		%{name}
 Version:	%{version}
@@ -22,7 +20,7 @@ Source0:	http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/L
 Patch0:		%{name}-build.patch
 Requires:	avalon-framework >= 0:4.1.4
 Requires:	servlet
-%if !%{no_nonfree_deps}
+%if %{use_nonfree}
 Requires:	jms
 %endif
 Requires:	jdbc-stdext
@@ -33,7 +31,7 @@ BuildRequires:  junit
 BuildRequires:  log4j
 BuildRequires:	avalon-framework >= 0:4.1.4
 BuildRequires:	servlet
-%if !%{no_nonfree_deps}
+%if %{use_nonfree}
 BuildRequires:	jms
 %endif
 BuildRequires:	jdbc-stdext