diff --git a/gawk.changes b/gawk.changes
index 2083375..9906c28 100644
--- a/gawk.changes
+++ b/gawk.changes
@@ -1,9 +1,9 @@
 -------------------------------------------------------------------
 Mon Apr 10 07:39:22 UTC 2017 - josef.moellers@suse.com
 
-- Split off a seperate package "gawk-devel"
-  which contains the .h file describing the API, a set of
-  sample extensions and their manual pages.
+- Added an explicit rpmlint rule to keep one file (gawkapi.h)
+  from requiring a separate package.
+  [+gawk.rpmlintrc]
 
 -------------------------------------------------------------------
 Mon Sep  5 20:27:40 UTC 2016 - astieger@suse.com
diff --git a/gawk.rpmlintrc b/gawk.rpmlintrc
new file mode 100644
index 0000000..eb4daa3
--- /dev/null
+++ b/gawk.rpmlintrc
@@ -0,0 +1 @@
+addFilter("E: devel-file-in-non-devel-package")
diff --git a/gawk.spec b/gawk.spec
index a2a3ea7..29a20b5 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -35,18 +35,10 @@ Requires(preun): update-alternatives
 Provides:       awk
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%description -n gawk
+%description
 GNU awk is upwardly compatible with the System V Release 4 awk.  It is
 almost completely POSIX 1003.2 compliant.
 
-%package -n gawk-devel
-Summary:        Files and samples for gawk extensions
-Group:          Development/Libraries/C and C++
-Requires:       gawk = %{version}
-
-%description -n gawk-devel
-Contains API description and sample extensions for gawk
-
 %prep
 %setup -q
 chmod -x COPYING
@@ -81,7 +73,7 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a
 
 %find_lang %{name}
 
-%post -n gawk
+%post
 %{_sbindir}/update-alternatives \
   --install /bin/awk awk %{_bindir}/gawk 20 \
   --slave %{_bindir}/awk usr-bin-awk %{_bindir}/gawk \
@@ -89,14 +81,14 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a
 %install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz
 
-%preun -n gawk
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz
 if [ $1 -eq 0 ]; then
     %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk
 fi
 
-%files -n gawk -f %{name}.lang
+%files -f %{name}.lang
 %defattr(-,root,root)
 #UsrMerge
 /bin/awk
@@ -113,14 +105,12 @@ fi
 %{_bindir}/gawk
 %{_bindir}/igawk
 %{_libdir}/awk
+%{_libdir}/gawk
+%{_includedir}/gawkapi.h
 %{_datadir}/awk
 %{_infodir}/*.info.gz
 %{_mandir}/man1/gawk.1%{?ext_man}
 %{_mandir}/man1/igawk.1%{?ext_man}
-
-%files -n gawk-devel
-%{_libdir}/gawk
-%{_includedir}/gawkapi.h
 %{_mandir}/man3/*%{?ext_man}
 
 %changelog