diff -Naur iscan-2.20.0_old/lib/basic-imgstream.cc iscan-2.20.0/lib/basic-imgstream.cc
--- iscan-2.20.0_old/lib/basic-imgstream.cc	2009-06-08 04:39:33.000000000 +0200
+++ iscan-2.20.0/lib/basic-imgstream.cc	2009-07-07 21:03:50.584465554 +0200
@@ -117,7 +117,7 @@
   }
 
   // forward declarations
-  static int reversionsort (const void*, const void*);
+  static int reversionsort (const dirent**, const dirent**);
   int selector (const dirent *);
 
   //!
@@ -270,7 +270,7 @@
 
   //! The C library's versionsort() function in reverse.
   static int
-  reversionsort (const void *a, const void *b)
+  reversionsort (const dirent **a, const dirent **b)
   {
     return versionsort (b, a);
   }
diff -Naur iscan-2.20.0_old/non-free/Makefile.in iscan-2.20.0/non-free/Makefile.in
--- iscan-2.20.0_old/non-free/Makefile.in	2009-06-08 04:39:46.000000000 +0200
+++ iscan-2.20.0/non-free/Makefile.in	2009-07-07 21:04:03.849292590 +0200
@@ -415,7 +415,7 @@
 @ENABLE_FRONTEND_TRUE@	-rm -f $@
 @ENABLE_FRONTEND_TRUE@	case $(ISCAN_HOST_CPU) in \
 @ENABLE_FRONTEND_TRUE@	  i?86)		arch=i386;; \
-@ENABLE_FRONTEND_TRUE@	  x86_64)	arch=x86_64;; \
+@ENABLE_FRONTEND_TRUE@	  x86_64)	arch=x86_64.c2;; \
 @ENABLE_FRONTEND_TRUE@	  *)	echo "unsupported architecture" 1>&2; \
 @ENABLE_FRONTEND_TRUE@		exit 1;; \
 @ENABLE_FRONTEND_TRUE@	esac; \