diff --git a/Makefile.in b/Makefile.in
index b9edf1c30..7fb797f2e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -227,6 +227,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/backend/Makefile.in b/backend/Makefile.in
index ab5610d97..31b713a5a 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -220,6 +220,9 @@ liblexmark_la_OBJECTS = $(am_liblexmark_la_OBJECTS)
 libma1509_la_LIBADD =
 am_libma1509_la_OBJECTS = libma1509_la-ma1509.lo
 libma1509_la_OBJECTS = $(am_libma1509_la_OBJECTS)
+libmagicolor_la_LIBADD =
+am_libmagicolor_la_OBJECTS = libmagicolor_la-magicolor.lo
+libmagicolor_la_OBJECTS = $(am_libmagicolor_la_OBJECTS)
 libmatsushita_la_LIBADD =
 am_libmatsushita_la_OBJECTS = libmatsushita_la-matsushita.lo
 libmatsushita_la_OBJECTS = $(am_libmatsushita_la_OBJECTS)
@@ -768,6 +771,19 @@ libsane_ma1509_la_OBJECTS = $(nodist_libsane_ma1509_la_OBJECTS)
 libsane_ma1509_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libsane_ma1509_la_LDFLAGS) $(LDFLAGS) -o $@
+libsane_magicolor_la_DEPENDENCIES = $(COMMON_LIBS) libmagicolor.la \
+	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
+	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
+	sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
+	../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+nodist_libsane_magicolor_la_OBJECTS =  \
+	libsane_magicolor_la-magicolor-s.lo
+libsane_magicolor_la_OBJECTS = $(nodist_libsane_magicolor_la_OBJECTS)
+libsane_magicolor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libsane_magicolor_la_LDFLAGS) $(LDFLAGS) -o $@
 libsane_matsushita_la_DEPENDENCIES = $(COMMON_LIBS) libmatsushita.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
@@ -1299,13 +1315,13 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
 	$(libibm_la_SOURCES) $(libkodak_la_SOURCES) \
 	$(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
 	$(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
-	$(libma1509_la_SOURCES) $(libmatsushita_la_SOURCES) \
-	$(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
-	$(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
-	$(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
-	$(libnec_la_SOURCES) $(libnet_la_SOURCES) \
-	$(libniash_la_SOURCES) $(libp5_la_SOURCES) \
-	$(libpie_la_SOURCES) $(libpint_la_SOURCES) \
+	$(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
+	$(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
+	$(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
+	$(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
+	$(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
+	$(libnet_la_SOURCES) $(libniash_la_SOURCES) \
+	$(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
 	$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
 	$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
 	$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@@ -1355,6 +1371,7 @@ SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
 	$(nodist_libsane_leo_la_SOURCES) \
 	$(nodist_libsane_lexmark_la_SOURCES) \
 	$(nodist_libsane_ma1509_la_SOURCES) \
+	$(nodist_libsane_magicolor_la_SOURCES) \
 	$(nodist_libsane_matsushita_la_SOURCES) \
 	$(nodist_libsane_microtek_la_SOURCES) \
 	$(nodist_libsane_microtek2_la_SOURCES) \
@@ -1427,13 +1444,13 @@ DIST_SOURCES = $(libabaton_la_SOURCES) $(libagfafocus_la_SOURCES) \
 	$(libibm_la_SOURCES) $(libkodak_la_SOURCES) \
 	$(libkvs1025_la_SOURCES) $(libkvs20xx_la_SOURCES) \
 	$(libleo_la_SOURCES) $(liblexmark_la_SOURCES) \
-	$(libma1509_la_SOURCES) $(libmatsushita_la_SOURCES) \
-	$(libmicrotek_la_SOURCES) $(libmicrotek2_la_SOURCES) \
-	$(libmustek_la_SOURCES) $(libmustek_pp_la_SOURCES) \
-	$(libmustek_usb_la_SOURCES) $(libmustek_usb2_la_SOURCES) \
-	$(libnec_la_SOURCES) $(libnet_la_SOURCES) \
-	$(libniash_la_SOURCES) $(libp5_la_SOURCES) \
-	$(libpie_la_SOURCES) $(libpint_la_SOURCES) \
+	$(libma1509_la_SOURCES) $(libmagicolor_la_SOURCES) \
+	$(libmatsushita_la_SOURCES) $(libmicrotek_la_SOURCES) \
+	$(libmicrotek2_la_SOURCES) $(libmustek_la_SOURCES) \
+	$(libmustek_pp_la_SOURCES) $(libmustek_usb_la_SOURCES) \
+	$(libmustek_usb2_la_SOURCES) $(libnec_la_SOURCES) \
+	$(libnet_la_SOURCES) $(libniash_la_SOURCES) \
+	$(libp5_la_SOURCES) $(libpie_la_SOURCES) $(libpint_la_SOURCES) \
 	$(libpixma_la_SOURCES) $(libplustek_la_SOURCES) \
 	$(libplustek_pp_la_SOURCES) $(libpnm_la_SOURCES) \
 	$(libqcam_la_SOURCES) $(libricoh_la_SOURCES) \
@@ -1553,6 +1570,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@ 
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
@@ -1682,49 +1700,49 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
 	hp5590_low.h hpsj5s.conf.in hs2p.conf.in hs2p-scsi.c \
 	hs2p-scsi.h ibm.conf.in ibm-scsi.c kodak.conf.in leo.conf.in \
 	lexmark.conf.in lexmark_models.c lexmark_sensors.c \
-	ma1509.conf.in matsushita.conf.in microtek.conf.in \
-	microtek2.conf.in mustek.conf.in mustek_scsi_pp.c \
-	mustek_scsi_pp.h mustek_pp.conf.in mustek_pp_ccd300.c \
-	mustek_pp_ccd300.h mustek_pp_cis.c mustek_pp_cis.h \
-	mustek_pp_null.c mustek_usb.conf.in mustek_usb_high.c \
-	mustek_usb_high.h mustek_usb_low.c mustek_usb_low.h \
-	mustek_usb_mid.c mustek_usb_mid.h mustek_usb2_asic.c \
-	mustek_usb2_asic.h mustek_usb2_high.c mustek_usb2_high.h \
-	mustek_usb2_reflective.c mustek_usb2_transparent.c nec.conf.in \
-	net.conf.in niash_core.c niash_core.h niash_xfer.c \
-	niash_xfer.h pie.conf.in p5.conf.in p5_device.c pixma.conf.in \
-	pixma_sane_options.c pixma_sane_options.h plustek.conf.in \
-	plustek-usb.c plustek-usb.h plustek-usbcal.c \
-	plustek-usbcalfile.c plustek-usbdevs.c plustek-usbhw.c \
-	plustek-usbimg.c plustek-usbio.c plustek-usbmap.c \
-	plustek-usbscan.c plustek-usbshading.c plustek_pp.conf.in \
-	plustek-pp_dac.c plustek-pp_dbg.h plustek-pp_detect.c \
-	plustek-pp_genericio.c plustek-pp_hwdefs.h plustek-pp_image.c \
-	plustek-pp_io.c plustek-pp_map.c plustek-pp_misc.c \
-	plustek-pp_models.c plustek-pp_motor.c plustek-pp_p12.c \
-	plustek-pp_p12ccd.c plustek-pp_p48xx.c plustek-pp_p9636.c \
-	plustek-pp_procfs.c plustek-pp_procs.h plustek-pp_ptdrv.c \
-	plustek-pp_scale.c plustek-pp_scan.h plustek-pp_scandata.h \
-	plustek-pp_sysdep.h plustek-pp_tpa.c plustek-pp_types.h \
-	plustek-pp_wrapper.c qcam.conf.in ricoh.conf.in ricoh-scsi.c \
-	rts8891.conf.in rts8891_devices.c rts8891_low.c rts8891_low.h \
-	s9036.conf.in sceptre.conf.in sharp.conf.in sm3600-color.c \
-	sm3600-gray.c sm3600-homerun.c sm3600-scanmtek.c \
-	sm3600-scantool.h sm3600-scanusb.c sm3600-scanutil.c \
-	sm3840.conf.in sm3840_lib.c sm3840_lib.h sm3840_scan.c \
-	snapscan.conf.in snapscan-data.c snapscan-mutex.c \
-	snapscan-options.c snapscan-scsi.c snapscan-sources.c \
-	snapscan-sources.h snapscan-usb.c snapscan-usb.h sp15c.conf.in \
-	st400.conf.in stv680.conf.in tamarack.conf.in test.conf.in \
-	test-picture.c teco1.conf.in teco2.conf.in teco3.conf.in \
-	u12.conf.in u12-ccd.c u12-hw.c u12-hwdef.h u12-if.c \
-	u12-image.c u12-io.c u12-map.c u12-motor.c u12-scanner.h \
-	u12-shading.c u12-tpa.c umax.conf.in umax-scanner.c \
-	umax-scanner.h umax-scsidef.h umax-uc1200s.c umax-uc1200se.c \
-	umax-uc1260.c umax-uc630.c umax-uc840.c umax-ug630.c \
-	umax-ug80.c umax-usb.c umax1220u.conf.in umax1220u-common.c \
-	umax_pp.conf.in v4l.conf.in xerox_mfp.conf.in dll.conf.in \
-	dll.aliases
+	ma1509.conf.in magicolor.conf.in matsushita.conf.in \
+	microtek.conf.in microtek2.conf.in mustek.conf.in \
+	mustek_scsi_pp.c mustek_scsi_pp.h mustek_pp.conf.in \
+	mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c \
+	mustek_pp_cis.h mustek_pp_null.c mustek_usb.conf.in \
+	mustek_usb_high.c mustek_usb_high.h mustek_usb_low.c \
+	mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.h \
+	mustek_usb2_asic.c mustek_usb2_asic.h mustek_usb2_high.c \
+	mustek_usb2_high.h mustek_usb2_reflective.c \
+	mustek_usb2_transparent.c nec.conf.in net.conf.in niash_core.c \
+	niash_core.h niash_xfer.c niash_xfer.h pie.conf.in p5.conf.in \
+	p5_device.c pixma.conf.in pixma_sane_options.c \
+	pixma_sane_options.h plustek.conf.in plustek-usb.c \
+	plustek-usb.h plustek-usbcal.c plustek-usbcalfile.c \
+	plustek-usbdevs.c plustek-usbhw.c plustek-usbimg.c \
+	plustek-usbio.c plustek-usbmap.c plustek-usbscan.c \
+	plustek-usbshading.c plustek_pp.conf.in plustek-pp_dac.c \
+	plustek-pp_dbg.h plustek-pp_detect.c plustek-pp_genericio.c \
+	plustek-pp_hwdefs.h plustek-pp_image.c plustek-pp_io.c \
+	plustek-pp_map.c plustek-pp_misc.c plustek-pp_models.c \
+	plustek-pp_motor.c plustek-pp_p12.c plustek-pp_p12ccd.c \
+	plustek-pp_p48xx.c plustek-pp_p9636.c plustek-pp_procfs.c \
+	plustek-pp_procs.h plustek-pp_ptdrv.c plustek-pp_scale.c \
+	plustek-pp_scan.h plustek-pp_scandata.h plustek-pp_sysdep.h \
+	plustek-pp_tpa.c plustek-pp_types.h plustek-pp_wrapper.c \
+	qcam.conf.in ricoh.conf.in ricoh-scsi.c rts8891.conf.in \
+	rts8891_devices.c rts8891_low.c rts8891_low.h s9036.conf.in \
+	sceptre.conf.in sharp.conf.in sm3600-color.c sm3600-gray.c \
+	sm3600-homerun.c sm3600-scanmtek.c sm3600-scantool.h \
+	sm3600-scanusb.c sm3600-scanutil.c sm3840.conf.in sm3840_lib.c \
+	sm3840_lib.h sm3840_scan.c snapscan.conf.in snapscan-data.c \
+	snapscan-mutex.c snapscan-options.c snapscan-scsi.c \
+	snapscan-sources.c snapscan-sources.h snapscan-usb.c \
+	snapscan-usb.h sp15c.conf.in st400.conf.in stv680.conf.in \
+	tamarack.conf.in test.conf.in test-picture.c teco1.conf.in \
+	teco2.conf.in teco3.conf.in u12.conf.in u12-ccd.c u12-hw.c \
+	u12-hwdef.h u12-if.c u12-image.c u12-io.c u12-map.c \
+	u12-motor.c u12-scanner.h u12-shading.c u12-tpa.c umax.conf.in \
+	umax-scanner.c umax-scanner.h umax-scsidef.h umax-uc1200s.c \
+	umax-uc1200se.c umax-uc1260.c umax-uc630.c umax-uc840.c \
+	umax-ug630.c umax-ug80.c umax-usb.c umax1220u.conf.in \
+	umax1220u-common.c umax_pp.conf.in v4l.conf.in \
+	xerox_mfp.conf.in dll.conf.in dll.aliases
 
 # Backends are not required to have a config file. Any backend
 # that wants to install a config file should list it here.
@@ -1737,8 +1755,8 @@ BACKEND_CONFS = abaton.conf agfafocus.conf apple.conf artec.conf \
 	       epson.conf fujitsu.conf genesys.conf gphoto2.conf \
 	       gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
 	       hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf \
-	       leo.conf lexmark.conf ma1509.conf matsushita.conf \
-	       microtek2.conf microtek.conf mustek.conf \
+	       leo.conf lexmark.conf ma1509.conf magicolor.conf \
+	       matsushita.conf microtek2.conf microtek.conf mustek.conf \
 	       mustek_pp.conf mustek_usb.conf nec.conf net.conf \
 	       p5.conf \
 	       pie.conf pixma.conf plustek.conf plustek_pp.conf \
@@ -1776,7 +1794,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
     libhp5400.la libhp5590.la libhpljm1005.la \
     libhpsj5s.la libhs2p.la libibm.la libkodak.la \
     libkvs1025.la libkvs20xx.la \
-    libleo.la liblexmark.la libma1509.la \
+    libleo.la liblexmark.la libma1509.la libmagicolor.la \
     libmatsushita.la libmicrotek.la libmicrotek2.la \
     libmustek.la libmustek_pp.la libmustek_usb.la \
     libmustek_usb2.la libnec.la libnet.la \
@@ -1809,8 +1827,8 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
     libsane-hp3500.la libsane-hp3900.la libsane-hp4200.la \
     libsane-hp5400.la libsane-hp5590.la libsane-hpljm1005.la \
     libsane-hpsj5s.la libsane-hs2p.la libsane-ibm.la libsane-kodak.la \
-    libsane-kvs1025.la libsane-kvs20xx.la \
-    libsane-leo.la libsane-lexmark.la libsane-ma1509.la \
+    libsane-kvs1025.la libsane-kvs20xx.la libsane-leo.la \
+    libsane-lexmark.la libsane-ma1509.la libsane-magicolor.la \
     libsane-matsushita.la libsane-microtek.la libsane-microtek2.la \
     libsane-mustek.la libsane-mustek_pp.la libsane-mustek_usb.la \
     libsane-mustek_usb2.la libsane-nec.la libsane-net.la \
@@ -2117,6 +2135,12 @@ nodist_libsane_ma1509_la_SOURCES = ma1509-s.c
 libsane_ma1509_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=ma1509
 libsane_ma1509_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_ma1509_la_LIBADD = $(COMMON_LIBS) libma1509.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS)
+libmagicolor_la_SOURCES = magicolor.c magicolor.h
+libmagicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor
+nodist_libsane_magicolor_la_SOURCES = magicolor-s.c
+libsane_magicolor_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=magicolor
+libsane_magicolor_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+libsane_magicolor_la_LIBADD = $(COMMON_LIBS) libmagicolor.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo  ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo  $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
 libmatsushita_la_SOURCES = matsushita.c matsushita.h
 libmatsushita_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=matsushita
 nodist_libsane_matsushita_la_SOURCES = matsushita-s.c
@@ -2578,6 +2602,8 @@ liblexmark.la: $(liblexmark_la_OBJECTS) $(liblexmark_la_DEPENDENCIES)
 	$(LINK)  $(liblexmark_la_OBJECTS) $(liblexmark_la_LIBADD) $(LIBS)
 libma1509.la: $(libma1509_la_OBJECTS) $(libma1509_la_DEPENDENCIES) 
 	$(LINK)  $(libma1509_la_OBJECTS) $(libma1509_la_LIBADD) $(LIBS)
+libmagicolor.la: $(libmagicolor_la_OBJECTS) $(libmagicolor_la_DEPENDENCIES) 
+	$(LINK)  $(libmagicolor_la_OBJECTS) $(libmagicolor_la_LIBADD) $(LIBS)
 libmatsushita.la: $(libmatsushita_la_OBJECTS) $(libmatsushita_la_DEPENDENCIES) 
 	$(LINK)  $(libmatsushita_la_OBJECTS) $(libmatsushita_la_LIBADD) $(LIBS)
 libmicrotek.la: $(libmicrotek_la_OBJECTS) $(libmicrotek_la_DEPENDENCIES) 
@@ -2710,6 +2736,8 @@ libsane-lexmark.la: $(libsane_lexmark_la_OBJECTS) $(libsane_lexmark_la_DEPENDENC
 	$(libsane_lexmark_la_LINK)  $(libsane_lexmark_la_OBJECTS) $(libsane_lexmark_la_LIBADD) $(LIBS)
 libsane-ma1509.la: $(libsane_ma1509_la_OBJECTS) $(libsane_ma1509_la_DEPENDENCIES) 
 	$(libsane_ma1509_la_LINK)  $(libsane_ma1509_la_OBJECTS) $(libsane_ma1509_la_LIBADD) $(LIBS)
+libsane-magicolor.la: $(libsane_magicolor_la_OBJECTS) $(libsane_magicolor_la_DEPENDENCIES) 
+	$(libsane_magicolor_la_LINK)  $(libsane_magicolor_la_OBJECTS) $(libsane_magicolor_la_LIBADD) $(LIBS)
 libsane-matsushita.la: $(libsane_matsushita_la_OBJECTS) $(libsane_matsushita_la_DEPENDENCIES) 
 	$(libsane_matsushita_la_LINK)  $(libsane_matsushita_la_OBJECTS) $(libsane_matsushita_la_LIBADD) $(LIBS)
 libsane-microtek.la: $(libsane_microtek_la_OBJECTS) $(libsane_microtek_la_DEPENDENCIES) 
@@ -2911,6 +2939,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblexmark_la-lexmark.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblexmark_la-lexmark_low.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libma1509_la-ma1509.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmagicolor_la-magicolor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatsushita_la-matsushita.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrotek2_la-microtek2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrotek_la-microtek.Plo@am__quote@
@@ -2986,6 +3015,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_leo_la-leo-s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_lexmark_la-lexmark-s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_ma1509_la-ma1509-s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_magicolor_la-magicolor-s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_matsushita_la-matsushita-s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_microtek2_la-microtek2-s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_microtek_la-microtek-s.Plo@am__quote@
@@ -3589,6 +3619,13 @@ libma1509_la-ma1509.lo: ma1509.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libma1509_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libma1509_la-ma1509.lo `test -f 'ma1509.c' || echo '$(srcdir)/'`ma1509.c
 
+libmagicolor_la-magicolor.lo: magicolor.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagicolor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmagicolor_la-magicolor.lo -MD -MP -MF $(DEPDIR)/libmagicolor_la-magicolor.Tpo -c -o libmagicolor_la-magicolor.lo `test -f 'magicolor.c' || echo '$(srcdir)/'`magicolor.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmagicolor_la-magicolor.Tpo $(DEPDIR)/libmagicolor_la-magicolor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='magicolor.c' object='libmagicolor_la-magicolor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagicolor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmagicolor_la-magicolor.lo `test -f 'magicolor.c' || echo '$(srcdir)/'`magicolor.c
+
 libmatsushita_la-matsushita.lo: matsushita.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmatsushita_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmatsushita_la-matsushita.lo -MD -MP -MF $(DEPDIR)/libmatsushita_la-matsushita.Tpo -c -o libmatsushita_la-matsushita.lo `test -f 'matsushita.c' || echo '$(srcdir)/'`matsushita.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmatsushita_la-matsushita.Tpo $(DEPDIR)/libmatsushita_la-matsushita.Plo
@@ -4107,6 +4144,13 @@ libsane_ma1509_la-ma1509-s.lo: ma1509-s.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_ma1509_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_ma1509_la-ma1509-s.lo `test -f 'ma1509-s.c' || echo '$(srcdir)/'`ma1509-s.c
 
+libsane_magicolor_la-magicolor-s.lo: magicolor-s.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_magicolor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_magicolor_la-magicolor-s.lo -MD -MP -MF $(DEPDIR)/libsane_magicolor_la-magicolor-s.Tpo -c -o libsane_magicolor_la-magicolor-s.lo `test -f 'magicolor-s.c' || echo '$(srcdir)/'`magicolor-s.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsane_magicolor_la-magicolor-s.Tpo $(DEPDIR)/libsane_magicolor_la-magicolor-s.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='magicolor-s.c' object='libsane_magicolor_la-magicolor-s.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_magicolor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsane_magicolor_la-magicolor-s.lo `test -f 'magicolor-s.c' || echo '$(srcdir)/'`magicolor-s.c
+
 libsane_matsushita_la-matsushita-s.lo: matsushita-s.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsane_matsushita_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsane_matsushita_la-matsushita-s.lo -MD -MP -MF $(DEPDIR)/libsane_matsushita_la-matsushita-s.Tpo -c -o libsane_matsushita_la-matsushita-s.lo `test -f 'matsushita-s.c' || echo '$(srcdir)/'`matsushita-s.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsane_matsushita_la-matsushita-s.Tpo $(DEPDIR)/libsane_matsushita_la-matsushita-s.Plo
diff --git a/configure b/configure
index c8f4fc659..b26c16f80 100755
--- a/configure
+++ b/configure
@@ -650,6 +650,7 @@ ALLOCA
 LIBOBJS
 SOCKET_LIBS
 RESMGR_LIBS
+SNMP_CONFIG_PATH
 AVAHI_LIBS
 AVAHI_CFLAGS
 LIBV4L_LIBS
@@ -792,6 +793,7 @@ enable_locking
 with_group
 with_gphoto2
 enable_avahi
+with_snmp
 enable_libusb_1_0
 enable_libusb
 enable_scsibuffersize
@@ -1488,6 +1490,7 @@ Optional Packages:
   --with-docdir=DIR       documentation [PREFIX/doc/sane-VERSION]
   --with-group            use the specified group for lock dir [default=uucp]
   --with-gphoto2          include the gphoto2 backend [default=yes]
+  --with-snmp             enable SNMP support [default=yes]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -6044,10 +6047,18 @@ if test "$HAVE_LE32TOH" != "1"; then
 /* Define aliases for the standard byte swapping macros */
 /* Arguments to these macros must be properly aligned on natural word */
 /* boundaries in order to work properly on all architectures */
+#ifndef htobe16
 #define htobe16(x) htons(x)
+#endif
+#ifndef htobe32
 #define htobe32(x) htonl(x)
+#endif
+#ifndef be16toh
 #define be16toh(x) ntohs(x)
+#endif
+#ifndef be32toh
 #define be32toh(x) ntohl(x)
+#endif
 
 #define HTOBE16(x) (x) = htobe16(x)
 #define HTOBE32(x) (x) = htobe32(x)
@@ -6059,13 +6070,25 @@ EOF
  if test $ac_cv_c_bigendian = yes; then
   cat >> "$ac_byteorder" << EOF
 /* Define our own extended byte swapping macros for big-endian machines */
+#ifndef htole16
 #define htole16(x)      swap16(x)
+#endif
+#ifndef htole32
 #define htole32(x)      swap32(x)
+#endif
+#ifndef le16toh
 #define le16toh(x)      swap16(x)
+#endif
+#ifndef le32toh
 #define le32toh(x)      swap32(x)
+#endif
 
+#ifndef htobe64
 #define htobe64(x)      (x)
+#endif
+#ifndef be64toh
 #define be64toh(x)      (x)
+#endif
 
 #define HTOLE16(x)      (x) = htole16(x)
 #define HTOLE32(x)      (x) = htole32(x)
@@ -6079,12 +6102,24 @@ EOF
  else
   cat >> "$ac_byteorder" << EOF
 /* On little endian machines, these macros are null */
+#ifndef htole16
 #define htole16(x)      (x)
+#endif
+#ifndef htole32
 #define htole32(x)      (x)
+#endif
+#ifndef htole64
 #define htole64(x)      (x)
+#endif
+#ifndef le16toh
 #define le16toh(x)      (x)
+#endif
+#ifndef le32toh
 #define le32toh(x)      (x)
+#endif
+#ifndef le64toh
 #define le64toh(x)      (x)
+#endif
 
 #define HTOLE16(x)      (void) (x)
 #define HTOLE32(x)      (void) (x)
@@ -6094,8 +6129,12 @@ EOF
 #define LE64TOH(x)      (void) (x)
 
 /* These don't have standard aliases */
+#ifndef htobe64
 #define htobe64(x)      swap64(x)
+#endif
+#ifndef be64toh
 #define be64toh(x)      swap64(x)
+#endif
 
 #define HTOBE64(x)      (x) = htobe64(x)
 #define BE64TOH(x)      (x) = be64toh(x)
@@ -7687,6 +7726,139 @@ if test "x$ac_cv_lib_sane_sane_init" = x""yes; then :
 fi
 
 
+
+
+
+# Check whether --with-snmp was given.
+if test "${with_snmp+set}" = set; then :
+  withval=$with_snmp;
+fi
+
+
+if test "$with_snmp" = "no"; then
+	echo "Not including SNMP support"
+else
+	# Extract the first word of "net-snmp-config", so it can be a program name with args.
+set dummy net-snmp-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SNMP_CONFIG_PATH+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SNMP_CONFIG_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SNMP_CONFIG_PATH="$SNMP_CONFIG_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_SNMP_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_SNMP_CONFIG_PATH" && ac_cv_path_SNMP_CONFIG_PATH=""no""
+  ;;
+esac
+fi
+SNMP_CONFIG_PATH=$ac_cv_path_SNMP_CONFIG_PATH
+if test -n "$SNMP_CONFIG_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG_PATH" >&5
+$as_echo "$SNMP_CONFIG_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snmp_timeout in -lnetsnmp" >&5
+$as_echo_n "checking for snmp_timeout in -lnetsnmp... " >&6; }
+if test "${ac_cv_lib_netsnmp_snmp_timeout+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnetsnmp  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char snmp_timeout ();
+int
+main ()
+{
+return snmp_timeout ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_netsnmp_snmp_timeout=yes
+else
+  ac_cv_lib_netsnmp_snmp_timeout=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netsnmp_snmp_timeout" >&5
+$as_echo "$ac_cv_lib_netsnmp_snmp_timeout" >&6; }
+if test "x$ac_cv_lib_netsnmp_snmp_timeout" = x""yes; then :
+  LIBSNMP_EXISTS="yes"
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proper SNMP version" >&5
+$as_echo_n "checking for proper SNMP version... " >&6; }
+	if test "$SNMP_CONFIG_PATH" != "no" ; then
+		snmp_version=`$SNMP_CONFIG_PATH --version 2>/dev/null`
+		vers=`echo $snmp_version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2);}'`
+		if test -n "$vers" && test "$vers" -ge 5005; then
+			SNMP_LIBS=`$SNMP_CONFIG_PATH --libs`
+			SNMP_CFLAGS=`$SNMP_CONFIG_PATH --cflags`
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			with_snmp="yes"
+		else
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need at least net-snmp 5.5, your version is $snmp_version" >&5
+$as_echo "$as_me: WARNING: You need at least net-snmp 5.5, your version is $snmp_version" >&2;}
+			with_snmp="no"
+		fi
+	else
+		with_snmp="no"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	fi
+fi
+
+if test "$with_snmp" = "yes"; then
+	LIBS="$LIBS $SNMP_LIBS"
+	CFLAGS="$CFLAGS $SNMP_CFLAGS"
+
+$as_echo "#define HAVE_LIBSNMP 1" >>confdefs.h
+
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Warning: net-snmp library disabled, autodetecting network scanners will not be supported." >&5
+$as_echo "$as_me: WARNING: *** Warning: net-snmp library disabled, autodetecting network scanners will not be supported." >&2;}
+fi
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then :
@@ -16699,7 +16871,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \
         dell1600n_net dmc epjitsu epson epson2 fujitsu genesys \
         gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \
         hp5590 hpsj5s hpljm1005 hs2p ibm kodak kvs1025 kvs20xx \
-        leo lexmark ma1509 \
+        leo lexmark ma1509 magicolor \
         matsushita microtek microtek2 mustek mustek_pp \
         mustek_usb mustek_usb2 nec net niash pie pint \
         pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
@@ -19991,6 +20163,7 @@ else
 fi
 echo "IPv6 support:  `eval eval echo ${ipv6}`"
 echo "Avahi support: `eval eval echo ${enable_avahi}`"
+echo "SNMP support:  `eval eval echo ${with_snmp}`"
 echo "-> The following backends will be built:"
 for backend in ${BACKENDS} ; do
   echo $ECHO_N "${backend} "
diff --git a/configure.in b/configure.in
index f76d601b1..ff7a23963 100644
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,7 @@ dnl SNMP CHECKS
 dnl **************************************************************
 
 AC_ARG_WITH(snmp,
-	AC_HELP_STRING([--without-snmp], [disable SNMP support]))
+	AC_HELP_STRING([--with-snmp], [enable SNMP support @<:@default=yes@:>@]))
 
 if test "$with_snmp" = "no"; then
 	echo "Not including SNMP support"
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d78e94dea..af882be9b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -190,6 +190,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
@@ -282,17 +283,18 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	sane-hpljm1005.man sane-cardscan.man sane-hp3900.man \
 	sane-epjitsu.man sane-hs2p.man sane-canon_dr.man \
 	sane-xerox_mfp.man sane-rts8891.man sane-coolscan3.man \
-	sane-kvs1025.man sane-kvs20xx.man sane-p5.man sane.man \
-	saned.man descriptions.txt releases.txt sane-logo2.jpg \
-	sane-logo.png sane.png sane.tex net.tex html.sty $(DESC_FILES) \
-	descriptions/template.desc. $(DESC_EXT_FILES) \
-	descriptions-external/template.desc. figs/area.eps \
-	figs/area.fig figs/flow.eps figs/flow.fig figs/hierarchy.eps \
-	figs/hierarchy.fig figs/image-data.eps figs/image-data.fig \
-	figs/xfer.eps figs/xfer.fig icons/contents.gif icons/index.gif \
-	icons/next.gif icons/next_gr.gif icons/previous.gif \
-	icons/previous_gr.gif icons/references.gif \
-	icons/references_gr.gif icons/up.gif icons/up_gr.gif
+	sane-kvs1025.man sane-kvs20xx.man sane-p5.man \
+	sane-magicolor.man sane.man saned.man descriptions.txt \
+	releases.txt sane-logo2.jpg sane-logo.png sane.png sane.tex \
+	net.tex html.sty $(DESC_FILES) descriptions/template.desc. \
+	$(DESC_EXT_FILES) descriptions-external/template.desc. \
+	figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
+	figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
+	figs/image-data.fig figs/xfer.eps figs/xfer.fig \
+	icons/contents.gif icons/index.gif icons/next.gif \
+	icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
+	icons/references.gif icons/references_gr.gif icons/up.gif \
+	icons/up_gr.gif
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
@@ -313,7 +315,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \
 	sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5 \
 	sane-rts8891.5 sane-coolscan3.5 sane-kvs1025.5 sane-kvs20xx.5 \
-	sane-p5.5
+	sane-p5.5 sane-magicolor.5
 
 man7_MANS = sane.7
 man8_MANS = saned.8
@@ -380,6 +382,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
   descriptions/kodak.desc descriptions/kvs1025.desc descriptions/kvs20xx.desc \
   descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
+  descriptions/magicolor.desc \
   descriptions/matsushita.desc descriptions/microtek2.desc \
   descriptions/microtek.desc descriptions/mustek.desc \
   descriptions/mustek_pp.desc descriptions/mustek_usb2.desc \
diff --git a/doc/sane-magicolor.man b/doc/sane-magicolor.man
index 66e95f069..ac83a329a 100644
--- a/doc/sane-magicolor.man
+++ b/doc/sane-magicolor.man
@@ -1,5 +1,5 @@
 .\" .IX sane-magicolor
-.TH "sane-magicolor" "5" "08 Feb 2005" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane-magicolor" "5" "10 Jan 2011" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .SH "NAME"
 sane\-magicolor \- SANE backend for KONICA MINOLTA magicolor scanners
 .SH "DESCRIPTION"
diff --git a/frontend/Makefile.in b/frontend/Makefile.in
index c3deea575..5f2309735 100644
--- a/frontend/Makefile.in
+++ b/frontend/Makefile.in
@@ -189,6 +189,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/include/Makefile.in b/include/Makefile.in
index 09b98cd28..da8221fe4 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -175,6 +175,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/japi/Makefile.in b/japi/Makefile.in
index 72d6d034c..d60182dd1 100644
--- a/japi/Makefile.in
+++ b/japi/Makefile.in
@@ -198,6 +198,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4604ea228..025adb5a2 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -173,6 +173,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/po/Makefile.in b/po/Makefile.in
index ffac1234b..5841c455f 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -151,6 +151,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/sanei/Makefile.in b/sanei/Makefile.in
index 6e2056005..a89c61db3 100644
--- a/sanei/Makefile.in
+++ b/sanei/Makefile.in
@@ -189,6 +189,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3604be414..69ff63d74 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -148,6 +148,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 9ec1c15d4..3f3756198 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -208,6 +208,7 @@ SCSI_LIBS = @SCSI_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@