diff --git a/hplip.changes b/hplip.changes
index d309dc8..4dff852 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed May  7 13:49:16 CEST 2014 - jsmeix@suse.de
+
+- Moved the hpcupsfax filter to the hplip-hpijs sub-package
+  because the HP-Fax*hpcups PPDs in the hplip-hpijs sub-package
+  that use that filter work technically correct when only the
+  hplip-hpijs RPM is installed regardless that in practice
+  queues with a HP-Fax*hpcups PPD usually use the hpfax backend
+  Python script that belongs to the hplip main-package because
+  it imports HPLIP Python modules.
+- Moved the hpps filter to the hplip main-package because the PPDs
+  for various printers that use that filter do not work when only
+  the hplip-hpijs RPM is installed because the hpps Python script
+  imports HPLIP Python modules from the hplip main-package.
+  Accordingly moved the PPDs that use the hpps filter
+  to the hplip main-package (bnc#876690).
+
 -------------------------------------------------------------------
 Wed Apr 23 10:26:50 CEST 2014 - jsmeix@suse.de
 
diff --git a/hplip.spec b/hplip.spec
index e473d54..6d0a8a0 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           hplip
 BuildRequires:  cups
 BuildRequires:  cups-devel
@@ -499,6 +500,21 @@ for p in *.ppd
 do grep -E -v '^\*UIConstraints:|^\*NonUIConstraints:|^\*cupsFilter:' $p | cupstestppd - || true
    gzip $p
 done
+echo "Moving PPDs that use the hpps filter to /usr/share/cups/model/manufacturer-PPDs/hplip-hpps..."
+# PPDs for various printers that use the hpps filter
+# must be moved to the hplip main-package because
+# the /usr/lib/cups/filter/hpps Python script imports
+# various HPLIP modules from the hplip main-package
+# so that the hpps filter belongs to the hplip main-package
+# (see https://bugzilla.novell.com/show_bug.cgi?id=876690).
+# Accordingly the PPDs that use the hpps filter must be moved
+# to the hplip main-package which is implemented by moving them
+# to a new directory /usr/share/cups/model/manufacturer-PPDs/hplip-hpps
+# that is listed in the files list of the hplip main-package:
+install -d %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}-hpps
+for p in *.ppd.gz
+do zgrep -q '^\*cupsFilter:.*hpps' $p && mv $p ../%{name}-hpps
+done
 echo "End of general tests and adjustments for all PPDs."
 # Switch back to the usual build log messages:
 set -x
@@ -538,7 +554,7 @@ install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
 # and even in current openSUSE versions fdupes links across sub-package boundaries,
 # compare https://bugzilla.novell.com/show_bug.cgi?id=784869
 # so that fdupes can only run for specific directories where linking files is safe:
-%fdupes -s %{buildroot}/%{_datadir}/hplip/data/images
+%fdupes -s %{buildroot}%{_datadir}/hplip/data/images
 
 %post
 %if 0%{?suse_version} >= 1140
@@ -664,7 +680,11 @@ exit 0
 %dir /usr/lib/cups/backend
 /usr/lib/cups/backend/hpfax
 %dir /usr/lib/cups/filter
-/usr/lib/cups/filter/hpcupsfax
+/usr/lib/cups/filter/hpps
+%dir %{_datadir}/cups
+%dir %{_datadir}/cups/model
+%dir %{_datadir}/cups/model/manufacturer-PPDs
+%{_datadir}/cups/model/manufacturer-PPDs/%{name}-hpps/
 %doc %{_defaultdocdir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/hplip/
@@ -685,7 +705,7 @@ exit 0
 %dir /usr/lib/cups/filter
 /usr/lib/cups/filter/foomatic-rip-hplip
 /usr/lib/cups/filter/hpcups
-/usr/lib/cups/filter/hpps
+/usr/lib/cups/filter/hpcupsfax
 /usr/lib/cups/filter/pstotiff
 %dir %{_datadir}/cups
 %dir %{_datadir}/cups/model