Slightly modified to fix building of rpms