Remove liver from giblets if desired. Place giblets and water in a saucepan. Cover and simmer for 2 hours or until tender.
Meanwhile, prepare the rice according to package directions. In small skillet, sauté celery and onion in butter; add to the rice. Drain and dice giblets. Stir stuffing, broth, and giblets into rice. Spoon into an ungreased 1 1/2 qt. baking dish.
Bake, uncovered at 350 degrees for 25-30 minutes or until heated through.