diff --git a/changelog b/changelog
index 0fdec2e1..64a2fc48 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,18 @@
-lasso (2.1.98-0) unstable; urgency=low
+lasso (2.1.98-1) unstable; urgency=low
 
-  * snapshot
+  * New upstream release (RC).
+  * debian/control:
+    * build new php5-lasso package.
+    * limit liblasso-java to architecture with gcj (closes: #477870).
+    * add Homepage field.
+    * liblasso3-dev: Replace ${Source-Version} with ${binary:Version}
+      (from Ubuntu patch)
+  * debian/rules:
+    * ignore liblasso-java package on architectures without gcj.
+    * update to match new upstream language bindings layout.
+    * don't ignore a make clean error.  (from Ubuntu patch)
 
- -- Frederic Peters <fpeters@debian.org>  Tue, 29 Apr 2008 12:02:56 +0200
+ -- Frederic Peters <fpeters@debian.org>  Tue, 29 Apr 2008 22:03:51 +0200
 
 lasso (2.1.1-3) unstable; urgency=low
 
diff --git a/control b/control
index 5bc2e28f..ba5918cc 100644
--- a/control
+++ b/control
@@ -2,14 +2,15 @@ Source: lasso
 Priority: optional
 Section: libs
 Maintainer: Frederic Peters <fpeters@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, gcj, gcj-4.3, php5-dev
+Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, java-gcj-compat [!alpha !arm !hppa !hurd-i386], gcj, gcj-4.3, php5-dev
 XS-Python-Version: all
 Standards-Version: 3.7.2
+Homepage: http://lasso.entrouvert.org
 
 Package: liblasso3-dev
 Section: libdevel
 Architecture: any
-Depends: liblasso3 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev
+Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev
 Provides: liblasso-dev
 Conflicts: liblasso-dev, liblasso0, liblasso1
 Description: Liberty ID-FF library - development kit
@@ -21,7 +22,6 @@ Description: Liberty ID-FF library - development kit
  .
  Homepage: http://lasso.entrouvert.org
  
-
 Package: liblasso3
 Section: libs
 Architecture: any
@@ -56,7 +56,7 @@ Description: Liberty ID-FF library - Python bindings
 
 Package: liblasso-java
 Section: libs
-Architecture: any
+Architecture: amd64 i386 ia64 powerpc ppc64 sparc kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:depends}
 Description: Liberty ID-FF library - Java bindings
  Lasso is an implementation of the Liberty Identity Federation specifications
diff --git a/rules b/rules
index 51f6c022..f6af92e1 100755
--- a/rules
+++ b/rules
@@ -61,8 +61,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -91,7 +90,9 @@ install: build
 	done
 
 	mkdir $(CURDIR)/debian/tmp/usr/lib/jni/
-	mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/
+	if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \
+	  mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \
+	fi
 
 
 # Build architecture-independent files here.