diff -u gmfsk-0.6+0.7pre1/debian/patches/00list gmfsk-0.6+0.7pre1/debian/patches/00list
--- gmfsk-0.6+0.7pre1/debian/patches/00list
+++ gmfsk-0.6+0.7pre1/debian/patches/00list
@@ -4,0 +5 @@
+13_log2_fix.dpatch
diff -u gmfsk-0.6+0.7pre1/debian/rules gmfsk-0.6+0.7pre1/debian/rules
--- gmfsk-0.6+0.7pre1/debian/rules
+++ gmfsk-0.6+0.7pre1/debian/rules
@@ -5,6 +5,8 @@
 
 build: build-stamp
 build-stamp: patch-stamp
+	cp -f /usr/share/misc/config.sub .
+	cp -f /usr/share/misc/config.guess .
 	dh_testdir
 	./configure --prefix=/usr --sysconfdir=/etc --enable-hamlib
 
@@ -14,9 +16,9 @@
 clean: clean1 unpatch
 clean1:
 	dh_testdir
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm build-stamp config.log
-	dh_clean
+	dh_clean config.guess config.sub
 
 binary-indep:	build
 # nothing else to do
@@ -43,10 +45,10 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
-	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb
 
diff -u gmfsk-0.6+0.7pre1/debian/control gmfsk-0.6+0.7pre1/debian/control
--- gmfsk-0.6+0.7pre1/debian/control
+++ gmfsk-0.6+0.7pre1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Hamish Moffatt <hamish@debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), fftw-dev, libgnomeui-dev, libhamlib-dev | hamlib-dev (>= 1.2.4), scrollkeeper, gconf2, dpatch
+Build-Depends: debhelper (>= 4), fftw-dev, libgnomeui-dev, libhamlib-dev | hamlib-dev (>= 1.2.4), scrollkeeper, gconf2, dpatch, autotools-dev
 
 Package: gmfsk
 Architecture: any
diff -u gmfsk-0.6+0.7pre1/debian/changelog gmfsk-0.6+0.7pre1/debian/changelog
--- gmfsk-0.6+0.7pre1/debian/changelog
+++ gmfsk-0.6+0.7pre1/debian/changelog
@@ -1,3 +1,18 @@
+gmfsk (0.6+0.7pre1-2.2) unstable; urgency=low
+
+  [ Kęstutis Bilūnas ]
+  * Non-maintainer upload.
+  * debian/patches: added the patch 13_log2_fix.dpatch for fix FTBFS
+    (Closes: #552851).
+  * debian/rules:
+    - fixed the order of calling debhelper programs dh_;
+    - fixed the clean target.
+
+  [ Christoph Egger ]
+  * Update config.*, remove again in clean so they don't show up in the diff
+
+ -- Kęstutis Bilūnas <kebil@kaunas.init.lt>  Tue, 08 Dec 2009 11:20:38 +0100
+
 gmfsk (0.6+0.7pre1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- gmfsk-0.6+0.7pre1.orig/debian/patches/13_log2_fix.dpatch
+++ gmfsk-0.6+0.7pre1/debian/patches/13_log2_fix.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_log2_fix.dpatch by Kęstutis Biliūnas <kebil@kaunas.init.lt>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for fix FTBFS bug #552851.
+## DP:
+## DP: This problem occurs because the function (log2) declared with the
+## DP: same name twice: in the file mfsk.h and in the file misk.h.
+## DP: But since the function log2 declared in header file misk.h is not
+## DP: used at all in this source, here this function is simply commented
+## DP: out.
+
+@DPATCH@
+diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.c gmfsk-0.6+0.7pre1/src/misc/misc.c
+--- gmfsk-0.6+0.7pre1~/src/misc/misc.c	2005-01-04 23:07:42.000000000 +0200
++++ gmfsk-0.6+0.7pre1/src/misc/misc.c	2009-11-29 01:16:37.000000000 +0200
+@@ -105,6 +105,7 @@
+ /*
+  * Integer base-2 logarithm
+  */
++/*
+ guint log2(guint x)
+ {
+ 	int y = 0;
+@@ -118,6 +119,7 @@
+ 
+ 	return y;
+ }
++*/
+ 
+ /* ---------------------------------------------------------------------- */
+ 
+diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.h gmfsk-0.6+0.7pre1/src/misc/misc.h
+--- gmfsk-0.6+0.7pre1~/src/misc/misc.h	2009-11-29 01:11:49.000000000 +0200
++++ gmfsk-0.6+0.7pre1/src/misc/misc.h	2009-11-29 01:17:12.000000000 +0200
+@@ -107,6 +107,7 @@
+ /*
+  * Integer base-2 logarithm
+  */
++/*
+ extern inline guint log2(guint x)
+ {
+ 	int y = 0;
+@@ -121,6 +121,7 @@
+ 
+ 	return y;
+ }
++*/
+ 
+ /* ---------------------------------------------------------------------- */
+