diff --git a/ecj.sh.in b/ecj.sh.in
index 1b2752d..3ca7c0d 100644
--- a/ecj.sh.in
+++ b/ecj.sh.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+CLASSPATH=@JAVADIR@/ecj.jar:${CLASSPATH=.} \
 java org.eclipse.jdt.internal.compiler.batch.Main "$@"
diff --git a/ecj.spec b/ecj.spec
index e2b3e41..1985c09 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -121,6 +121,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Dec 21 2009 Deepak Bhole <dbhole@redhat.com> 1:3.4.2-5
+- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.
+
 * Wed Mar 11 2009 Deepak Bhole <dbhole@redhat.com> 1:3.4.2-4
 - Add patch to generate full debuginfo for ecj itself