diff --git a/libtirpc.changes b/libtirpc.changes
index 0e0bc8b..03229a2 100644
--- a/libtirpc.changes
+++ b/libtirpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 15 16:59:02 CET 2018 - kukuk@suse.de
+
+- Move /usr/include/tirpc to /usr/include
+
 -------------------------------------------------------------------
 Mon Nov 27 14:30:05 CET 2017 - kukuk@suse.de
 
diff --git a/libtirpc.spec b/libtirpc.spec
index ac97d85..d33cd1d 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libtirpc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -119,6 +119,10 @@ mkdir -p %{buildroot}/%{_libdir}
 ln -sv /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
 rm -v %{buildroot}/%{_lib}/%{name}.{la,so}
 mv -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}
+# Move RPC headers from tirpc subdirectory into main directory,
+# they are now default
+mv -v %{buildroot}%{_includedir}/tirpc/* %{buildroot}%{_includedir}
+rmdir %{buildroot}%{_includedir}/tirpc
 
 %post -n libtirpc3 -p /sbin/ldconfig
 
@@ -137,8 +141,7 @@ mv -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libtirpc.so
-%dir /usr/include/tirpc/
-/usr/include/tirpc/*
+/usr/include/*
 /usr/%{_lib}/pkgconfig/*
 %{_mandir}/man3/*