--- Makefile.am.orig	2010-12-28 14:59:33.000000000 +0100
+++ Makefile.am	2010-12-28 15:01:50.000000000 +0100
@@ -494,15 +494,15 @@
 
 install-data-hook:
 if HPLIP_BUILD
-#	   If scanner build, add hpaio entry to sane dll.conf.
+#	   If scanner build, add hpaio entry to sane dll.d.
 	if [ "$(scan_build)" = "yes" ]; then \
 	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
-	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
-		  touch $(DESTDIR)/etc/sane.d/dll.conf; \
+	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.d/hplip ]; then \
+		  touch $(DESTDIR)/etc/sane.d/dll.d/hplip; \
 	   fi; \
-	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-		  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
-		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.d/hplip >/dev/null 2>/dev/null ; then \
+		  echo "Adding hpaio entry to /etc/sane.d/dll.d/hplip." ; \
+		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.d/hplip ; \
 	   fi \
 	fi
 if FULL_BUILD