diff --git a/rpcsvc-proto.changes b/rpcsvc-proto.changes
index 280e29a..c0302e8 100644
--- a/rpcsvc-proto.changes
+++ b/rpcsvc-proto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 12 10:00:55 CET 2017 - kukuk@suse.de
+
+- Re-enable rpcgen sub-package, but rename files, for easier
+  migration later
+
 -------------------------------------------------------------------
 Sun Nov 12 07:58:36 CET 2017 - kukuk@suse.de
 
diff --git a/rpcsvc-proto.spec b/rpcsvc-proto.spec
index ce41da0..f48ff36 100644
--- a/rpcsvc-proto.spec
+++ b/rpcsvc-proto.spec
@@ -42,7 +42,7 @@ glibc).
 
 %package -n rpcgen
 Summary:        RPC protocol compiler
-Group:          Development/Tools
+Group:          Development/Tools/Other
 Provides:       glibc-devel:%{_bindir}/rpcgen
 
 %description -n rpcgen
@@ -59,9 +59,9 @@ make %{?_smp_mflags}
 
 %install
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
-# Don't create rpcgen sub-package until we deprecate sunrpc in glibc
-rm -f %{buildroot}%{_bindir}/rpcgen
-rm -f %{buildroot}%{_mandir}/man1/rpcgen.1*
+# Rename temporary to avoid conflict with glibc for easier migration
+mv %{buildroot}%{_bindir}/rpcgen %{buildroot}%{_bindir}/rpcgen-tirpc
+mv %{buildroot}%{_mandir}/man1/rpcgen.1 %{buildroot}%{_mandir}/man1/rpcgen-tirpc.1
 
 
 %files devel
@@ -70,11 +70,9 @@ rm -f %{buildroot}%{_mandir}/man1/rpcgen.1*
 %dir %{_includedir}/tirpc/rpcsvc
 %{_includedir}/tirpc/rpcsvc/*
 
-%if 0
 %files -n rpcgen
 %defattr(-,root,root)
-%{_bindir}/rpcgen
-%{_mandir}/man1/rpcgen.1*
-%endif
+%{_bindir}/rpcgen-tirpc
+%{_mandir}/man1/rpcgen-tirpc.1*
 
 %changelog