diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 814239f..ed0ae09 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -5,6 +5,9 @@
 %define release		2jpp_1rh
 %define	section		free
 
+# This flag causes the omission of non-free dependencies.
+%define no_nonfree_deps 1
+
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
@@ -19,7 +22,9 @@ 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}
 Requires:	jms
+%endif
 Requires:	jdbc-stdext
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:	ant
@@ -28,7 +33,9 @@ BuildRequires:  junit
 BuildRequires:  log4j
 BuildRequires:	avalon-framework >= 0:4.1.4
 BuildRequires:	servlet
+%if !%{no_nonfree_deps}
 BuildRequires:	jms
+%endif
 BuildRequires:	jdbc-stdext
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -51,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %patch
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+# delete stuff that doesn't work with gcj log4j (ultimatly #130006).
+if java -version 2>&1 | grep -q "gcj"; then
+    rm -f src/java/org/apache/log/output/lf5/LF5LogTarget.java
+fi
 
 %build
 export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes