A List of Spiritual Gifts?

In my reading around the topic of 'Listening to God', 'Prayer', and the Charismatic Movement, I found myself returning to my old friend, "Systematic Theology" by Wayne Grudem. Grudem lists what he sees as the New Testament Gifts of the Spirit - given for the building of the Church and the advance of God's Kingdom. He helpfully ties each gift to the passage we find it in. I reproduce the list below, with some slight layout tweaks, as I think it is a helpful resource;

1 Corinthians 12:28
1) Apostle (an office, strictly speaking)
2) Prophet
3) Teacher
4) Miracles
5) Kinds of Healings
6) Helps
7) Administration
8) Tongues

1 Corinthians 12:8-10
9) Word of Wisdom
10) Word of Knowledge
11) Faith
(5) Gifts of Healing
(4) Miracles
(2) Prophecy
12) Distinguishing between spirits
(8) Tongues
13) Interpretation of Tongues

Ephesians 4:11 
(1) Apostle
(2) Prophet
14) Evangelist
15) Pastor-Teacher

Romans 12:6-8
(2) Prophecy
16) Serving
(3) Teaching
17) Encouraging
18) Contributing
19) Leadership
20) Mercy

1 Corinthians 7:7
21) Marriage
22) Celibacy

1 Peter 4:11
Whoever Speaks (covering several gifts)
Whoever renders Service (covering several gifts)

This list can be found on page 1020 of Grudem's "Systematic Theology", in the context of a serious discussion of them. I reproduce it partly as a resource, and also because I want to explore the Gifts of the Spirit on this Blog, directly related to my hope of writing a loose series of posts on Church, and what that means. As a convinced Charismatic, these Gifts are integral to my understanding of Church - and indeed for the most part any biblical understanding of Church.

I'm particularly excited/interested to see what happens when I share my view of modern-day apostleship. Its something that I feel quite strongly about (I won't in this post let you know what it is!) but that is influential in some of the disputes and divides in the Church today. This, and many other issues surrounding the Gifts of the Holy Spirit, make me excited about reading and grappling with this topic, and also the topic of Church.

______________

I hope this list is helpful, and I would love to have your comments and input on other biblical passages I should look at, not to mention specific commentaries/books that are relevant to the topic!