diff -u xtalk-1.3/debian/changelog xtalk-1.3/debian/changelog
--- xtalk-1.3/debian/changelog
+++ xtalk-1.3/debian/changelog
@@ -1,8 +1,12 @@
-xtalk (1.3-15ubuntu1) lucid; urgency=low
+xtalk (1.3-15.1) unstable; urgency=low
 
-  * debian/rules: Replace "dos2unix" with "fromdos" (Closes: #569446).
+  [Jari Aalto]
+  * debian/control
+    - (Build-Depends-Indep): adjust tofrodos version and add dos2unix. The
+      tofrodos after certain version does not carry the 'dos2unix' utility
+      (RC bug FTBFS serious; Closes: #569368).
 
- -- Michael Bienia <geser@ubuntu.com>  Fri, 12 Mar 2010 13:24:04 +0100
+ -- Jari Aalto <jari.aalto@cante.net>  Fri, 26 Mar 2010 21:02:44 +0200
 
 xtalk (1.3-15) unstable; urgency=low
 
diff -u xtalk-1.3/debian/rules xtalk-1.3/debian/rules
--- xtalk-1.3/debian/rules
+++ xtalk-1.3/debian/rules
@@ -33,7 +33,7 @@
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/xtalk install
-	fromdos debian/xtalk/usr/share/xtalk/*.py \
+	dos2unix debian/xtalk/usr/share/xtalk/*.py \
 		 debian/xtalk/usr/bin/xtalk
 
 binary-indep: build install
diff -u xtalk-1.3/debian/control xtalk-1.3/debian/control
--- xtalk-1.3/debian/control
+++ xtalk-1.3/debian/control
@@ -1,10 +1,9 @@
 Source: xtalk
 Section: net
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Luis Uribe <acme@eviled.org>
+Maintainer: Luis Uribe <acme@eviled.org>
 Build-Depends: debhelper (>= 5.0.37.2)
-Build-Depends-Indep: tofrodos, python, python-support (>= 0.3)
+Build-Depends-Indep: dos2unix | tofrodos (<< 1.7.8.debian.1-2), python, python-support (>= 0.3)
 Standards-Version: 3.7.2
 
 Package: xtalk