[arch-general] teapot package could be improved