diff --git a/hplip.spec b/hplip.spec
index 281d46e..87a98ee 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -10,8 +10,8 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.15.7
-Release: 1%{?dist}
-License: GPLv2+ and MIT
+Release: 2%{?dist}
+License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
@@ -40,8 +40,6 @@ Patch21: hplip-strncpy.patch
 Patch22: hplip-no-write-bytecode.patch
 Patch23: hplip-silence-ioerror.patch
 
-%global hpijs_epoch 1
-Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # due to hp-plugin (BZ#1196237)
 Requires: %{name}-compat-libs%{?_isa} = %{version}-%{release}
@@ -67,6 +65,10 @@ BuildRequires: python3-cups, cups
 # macros: %%{_tmpfilesdir}, %%{_udevrulesdir}
 BuildRequires: systemd
 
+# hpijs was merged into main package in 3.15.7-2
+Obsoletes: hpijs
+Provides:  hpijs
+
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
@@ -117,20 +119,6 @@ Requires: libsane-hpaio%{?_isa} = %{version}-%{release}
 %description gui
 HPLIP graphical tools.
 
-%package -n hpijs
-Summary: HP Printer Drivers
-Group: Applications/Publishing
-License: BSD
-Epoch: %{hpijs_epoch}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: cups >= 1:1.4
-
-%description -n hpijs
-hpijs is a collection of optimized drivers for HP printers.
-hpijs supports the DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000,
-Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900,
-PhotoSmart, DeskJet 990C, and PhotoSmart 100 series.
-
 %package -n libsane-hpaio
 Summary: SANE driver for scanners in HP's multi-function devices
 Group: System Environment/Daemons
@@ -369,25 +357,12 @@ rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
-# Sort out which PPDs go into which subpackage.
-# The ones that use hpps have to go into the main package (bug #1194186).
-find %{buildroot}%{_datadir}/ppd -type f | \
-    (while read fname
-     do
-         if zgrep -q '^\*cupsFilter.* hpps' "$fname"
-         then
-	     which=0
-         else
-	     which=1
-         fi
-         printf "$which %s\n" "$fname"
-     done) > ppds-all
-sed -ne "s,^0 %{buildroot},,p" ppds-all > ppds-hpps
-sed -ne "s,^1 %{buildroot},,p" ppds-all > ppds-nohpps
-rm -f ppds-all
-
-%files -f ppds-hpps
+%files
 %doc COPYING doc/*
+# ex-hpijs
+%{_bindir}/hpijs
+# ex-hpijs
+%{_bindir}/hpcups-update-ppds
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
@@ -416,8 +391,13 @@ rm -f ppds-all
 %{_bindir}/hp-wificonfig
 %{_cups_serverbin}/backend/hp
 %{_cups_serverbin}/backend/hpfax
+# ex-hpijs
+%{_cups_serverbin}/filter/hpcups
+%{_cups_serverbin}/filter/hpcupsfax
 %{_cups_serverbin}/filter/hpps
 %{_cups_serverbin}/filter/pstotiff
+# ex-hpijs
+%{_datadir}/cups/drv/*
 %{_datadir}/cups/mime/pstotiff.convs
 # Files
 %{_datadir}/hplip/align.py*
@@ -463,6 +443,7 @@ rm -f ppds-all
 %{_datadir}/hplip/pcard
 %{_datadir}/hplip/prnt
 %{_datadir}/hplip/scan
+%{_datadir}/ppd
 %{_localstatedir}/lib/hp
 %dir %attr(0775,root,lp) /run/hplip
 %{_tmpfilesdir}/hplip.conf
@@ -503,19 +484,11 @@ rm -f ppds-all
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/ui4
 
-%files -n hpijs -f ppds-nohpps
-%{_bindir}/hpijs
-%{_bindir}/hpcups-update-ppds
-%dir %{_datadir}/ppd/HP
-%{_datadir}/cups/drv/*
-%{_cups_serverbin}/filter/hpcups
-%{_cups_serverbin}/filter/hpcupsfax
-
 %files -n libsane-hpaio
 %{_libdir}/sane/libsane-*.so*
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
-%post -n hpijs
+%post
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %post libs -p /sbin/ldconfig
@@ -523,6 +496,9 @@ rm -f ppds-all
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 29 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-2
+- merge hpijs into main package (#1033952#14)
+
 * Wed Jul 15 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-1
 - 3.15.7