diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index d54b786..ad68799 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,6 +1,14 @@
-diff -up hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules hplip-3.15.6/data/rules/56-hpmud.rules
---- hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules	2015-06-10 19:27:31.068051786 +0200
-+++ hplip-3.15.6/data/rules/56-hpmud.rules	2015-06-10 19:28:46.533854350 +0200
+diff -up hplip-3.15.7/data/rules/56-hp_conf_usb.rules.udev-rules hplip-3.15.7/data/rules/56-hp_conf_usb.rules
+--- hplip-3.15.7/data/rules/56-hp_conf_usb.rules.udev-rules	2015-07-29 16:55:43.945687431 +0200
++++ hplip-3.15.7/data/rules/56-hp_conf_usb.rules	2015-07-29 16:55:43.945687431 +0200
+@@ -0,0 +1,4 @@
++# HPLIP udev rules file.
++
++# This rule will check the smart install feature, plugin status and firmware download for the required printers.
++ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service'"
+diff -up hplip-3.15.7/data/rules/56-hpmud.rules.udev-rules hplip-3.15.7/data/rules/56-hpmud.rules
+--- hplip-3.15.7/data/rules/56-hpmud.rules.udev-rules	2015-07-13 09:48:49.000000000 +0200
++++ hplip-3.15.7/data/rules/56-hpmud.rules	2015-07-29 16:55:43.945687431 +0200
 @@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built
  # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
  ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
@@ -9,15 +17,25 @@ diff -up hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules hplip-3.15.6/data/rul
 -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'"
 -
  LABEL="hpmud_rules_end"
-diff -up hplip-3.15.6/Makefile.in.udev-rules hplip-3.15.6/Makefile.in
---- hplip-3.15.6/Makefile.in.udev-rules	2015-06-07 21:26:22.000000000 +0200
-+++ hplip-3.15.6/Makefile.in	2015-06-10 19:27:31.069051784 +0200
-@@ -4591,7 +4591,7 @@ cups_drv = prnt/drv/hpcups.drv
+diff -up hplip-3.15.7/Makefile.in.udev-rules hplip-3.15.7/Makefile.in
+--- hplip-3.15.7/Makefile.in.udev-rules	2015-07-13 09:50:17.000000000 +0200
++++ hplip-3.15.7/Makefile.in	2015-07-29 16:56:45.707539958 +0200
+@@ -2463,6 +2463,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase
+ am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
+ 	prnt/pcl.py prnt/colorcal.py
+ am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
++	data/rules/56-hp_conf_usb.rules \
+ 	data/rules/56-hpmud_sysfs.rules
+ am__dist_rulessystem_DATA_DIST = data/rules/hplip-printer@.service
+ am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
+@@ -4607,8 +4608,8 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
  
  # hpmud.rules
 -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules
 +@HPLIP_BUILD_TRUE@rulesdir = /usr/lib/udev/rules.d
- @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules
++@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules data/rules/56-hp_conf_usb.rules
  @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
  @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+ @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
diff --git a/hplip.spec b/hplip.spec
index 87a98ee..c901fb1 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -156,7 +156,7 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
            prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \
            > prnt/drv/hpijs.drv.in
 
-# Don't add printer queue, just check plugin.
+# Move udev rule for calling hp-config_usb_printer into separate file
 # Move udev rules from /etc/ to /usr/lib/ (bug #748208).
 %patch6 -p1 -b .udev-rules
 
@@ -346,9 +346,6 @@ rm -f %{buildroot}%{_datadir}/hplip/uninstall.*
 rm -f %{buildroot}%{_bindir}/hp-uninstall
 rm -f %{buildroot}%{_datadir}/hplip/upgrade.*
 rm -f %{buildroot}%{_bindir}/hp-upgrade
-rm -f %{buildroot}%{_bindir}/hp-config_usb_printer
-rm -f %{buildroot}%{_unitdir}/hplip-printer@.service
-rm -f %{buildroot}%{_datadir}/hplip/config_usb_printer.*
 rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
 rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types
 rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
@@ -366,6 +363,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
+%{_bindir}/hp-config_usb_printer
 %{_bindir}/hp-devicesettings
 %{_bindir}/hp-diagnose_plugin
 %{_bindir}/hp-diagnose_queues
@@ -404,6 +402,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_datadir}/hplip/check-plugin.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
+%{_datadir}/hplip/config_usb_printer.py*
 %{_datadir}/hplip/devicesettings.py*
 %{_datadir}/hplip/diagnose_plugin.py*
 %{_datadir}/hplip/diagnose_queues.py*
@@ -447,10 +446,12 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_localstatedir}/lib/hp
 %dir %attr(0775,root,lp) /run/hplip
 %{_tmpfilesdir}/hplip.conf
+%{_udevrulesdir}/56-hp_conf_usb.rules
+%{_unitdir}/hplip-printer@.service
 
 %files common
 %doc COPYING
-%{_udevrulesdir}/*.rules
+%{_udevrulesdir}/56-hpmud.rules
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %dir %{_datadir}/hplip
@@ -498,6 +499,8 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %changelog
 * Wed Jul 29 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-2
 - merge hpijs into main package (#1033952#14)
+- ship hp-config_usb_printer in main package along with
+  udev rule and unit file (#1033952#11)
 
 * Wed Jul 15 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-1
 - 3.15.7