--- Makefile.in.orig	2010-12-28 14:59:26.000000000 +0100
+++ Makefile.in	2010-12-28 15:01:10.000000000 +0100
@@ -8307,15 +8307,15 @@
 
 
 install-data-hook:
-#	   If scanner build, add hpaio entry to sane dll.conf.
+#	   If scanner build, add hpaio entry to sane dll.d.
 @HPLIP_BUILD_TRUE@	if [ "$(scan_build)" = "yes" ]; then \
-@HPLIP_BUILD_TRUE@	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
-@HPLIP_BUILD_TRUE@	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
-@HPLIP_BUILD_TRUE@		  touch $(DESTDIR)/etc/sane.d/dll.conf; \
+@HPLIP_BUILD_TRUE@	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d/dll.d; \
+@HPLIP_BUILD_TRUE@	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.d/hplip ]; then \
+@HPLIP_BUILD_TRUE@		  touch $(DESTDIR)/etc/sane.d/dll.d/hplip; \
 @HPLIP_BUILD_TRUE@	   fi; \
-@HPLIP_BUILD_TRUE@	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-@HPLIP_BUILD_TRUE@		  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
-@HPLIP_BUILD_TRUE@		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+@HPLIP_BUILD_TRUE@	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.d/hplip >/dev/null 2>/dev/null ; then \
+@HPLIP_BUILD_TRUE@		  echo "Adding hpaio entry to /etc/sane.d/dll.d/hplip." ; \
+@HPLIP_BUILD_TRUE@		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.d/hplip ; \
 @HPLIP_BUILD_TRUE@	   fi \
 @HPLIP_BUILD_TRUE@	fi
 #	   Create hp-xxx commands in bindir.