diff -u tack-1.06/debian/copyright tack-1.06/debian/copyright
--- tack-1.06/debian/copyright
+++ tack-1.06/debian/copyright
@@ -17,9 +17,9 @@
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-2 file.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
 
 Files: debian/*
 Copyright: (C) 2007-2008 Daniel Baumann <daniel@debian.org>
@@ -40,3 +40,3 @@
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-2 file.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff -u tack-1.06/debian/rules tack-1.06/debian/rules
--- tack-1.06/debian/rules
+++ tack-1.06/debian/rules
@@ -5,12 +5,10 @@
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
 else
-	CFLAGS += -O2
+	CROSS=
 endif
 
 clean: unpatch
@@ -23,7 +21,7 @@
 
 	dh_clean
 
-config.status: configure patch
+config.status: configure patch-stamp
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -33,13 +31,13 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,-ltic" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
 
-	$(MAKE)
+	$(MAKE) LDFLAGS="-ltic -lncurses"
 
 	touch build-stamp
 
diff -u tack-1.06/debian/changelog tack-1.06/debian/changelog
--- tack-1.06/debian/changelog
+++ tack-1.06/debian/changelog
@@ -1,3 +1,17 @@
+tack (1.06-6) unstable; urgency=low
+
+  * Correcting indenting in copyright file.
+  * Updatingto debhelper 7.
+  * Updating to standards 3.8.0.
+  * Updating vcs fields in control file.
+  * Using patch-stamp rather than patch in rules file.
+  * Updating cross handling in rules file.
+  * Temporary passing -ltic and -lncurses in LDFLAGS directly to the
+    make call rather than to configure, thanks to Neil Williams
+    <codehelp@debian.org> (Closes: #501421).
+
+ -- Daniel Baumann <daniel@debian.org>  Wed,  8 Oct 2008 08:48:00 +0200
+
 tack (1.06-5) unstable; urgency=low
 
   * Adding debug package.
@@ -11,7 +25,7 @@
   * Rewriting copyright file in machine-interpretable format.
   * Updating package to debhelper 6.
   * Removing vim cruft.
-  * Reverting config.guess and configu.sub to upstream.
+  * Reverting config.guess and config.sub to upstream.
 
  -- Daniel Baumann <daniel@debian.org>  Wed, 16 Apr 2008 18:25:00 +0200
 
diff -u tack-1.06/debian/compat tack-1.06/debian/compat
--- tack-1.06/debian/compat
+++ tack-1.06/debian/compat
@@ -1 +1 @@
-6
+7
diff -u tack-1.06/debian/control tack-1.06/debian/control
--- tack-1.06/debian/control
+++ tack-1.06/debian/control
@@ -2,11 +2,11 @@
 Section: misc
 Priority: optional
 Maintainer: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 6), dpatch, autotools-dev, libncurses5-dev (>= 5.6+20071006-3)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), dpatch, autotools-dev, libncurses5-dev (>= 5.6+20071006-3)
+Standards-Version: 3.8.0
 Homepage: ftp://ftp.invisible-island.net/ncurses/
-Vcs-Browser: http://git.debian.net/?p=tack.git
-Vcs-Git: git://git.debian.net/git/tack.git
+Vcs-Browser: http://git.debian.net/?p=debian/tack.git
+Vcs-Git: git://git.debian.net/git/debian/tack.git
 
 Package: tack
 Architecture: any